Cleaning up scripts to only include useful stuff.

[git-central.git] / tests / t2200-server-post-receive-email.sh

diff --git a/tests/t2200-server-post-receive-email.sh b/tests/t2200-server-post-receive-email.sh
index 42f8b82..28733db 100644 (file)
--- a/tests/t2200-server-post-receive-email.sh
+++ b/tests/t2200-server-post-receive-email.sh
@@ -4,7 +4,7 @@ test_description='server post-receive email notification'
 
 . ./test-lib.sh
 
-export POST_RECEIVE_EMAIL_DUMP=true
+export USER_EMAIL=author@example.com
 
 test_expect_success 'setup' '
        echo "setup" >a &&
@@ -13,23 +13,27 @@ test_expect_success 'setup' '
        git clone ./. server &&
        rm -fr server/.git/hooks &&
        git remote add origin ./server &&
-       git config --add branch.master.remote origin &&
-       git config --add branch.master.merge refs/heads/master &&
-       GIT_DIR=./server/.git git config --add hooks.mailinglist commits@list.com &&
-       GIT_DIR=./server/.git git config --add hooks.debug true &&
-       GIT_DIR=.
+       git config branch.master.remote origin &&
+       git config branch.master.merge refs/heads/master &&
+       GIT_DIR=./server/.git git config hooks.post-receive-email.mailinglist commits@list.com &&
+       GIT_DIR=./server/.git git config hooks.post-receive-email.debug true &&
+       echo cbas >./server/.git/description
 '
 
-install_server_hook 'post-receive-email' 'post-receive'
+install_post_receive_hook 'post-receive-email'
 
 test_expect_success 'simple commit' '
+       old_commit_hash=$(git rev-parse HEAD) &&
+       old_commit_abbrev=$(git rev-parse --short HEAD) &&
+
        echo $test_name >a &&
        git commit -a -m "$test_name" &&
        git push &&
-       old_commit_hash=$(git rev-parse HEAD^)
-       new_commit_hash=$(git rev-parse HEAD)
-       new_commit_date=$(git log -n 1 --pretty=format:%cd HEAD)
-       interpolate ../t2200-1.txt 1.txt old_commit_hash new_commit_hash new_commit_date
+       new_commit_hash=$(git rev-parse HEAD) &&
+       new_commit_date=$(git log -n 1 --pretty=format:%cd HEAD) &&
+       new_commit_abbrev=$(git rev-parse --short HEAD) &&
+
+       interpolate ../t2200-1.txt 1.txt old_commit_hash old_commit_abbrev new_commit_hash new_commit_date new_commit_abbrev &&
        test_cmp 1.txt server/.git/refs.heads.master.out
 '