Cleaning up scripts to only include useful stuff.

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

diff --git a/tests/t2201-server-post-receive-email-tags.sh b/tests/t2201-server-post-receive-email-tags.sh
index bcd23cd..4b9f5a5 100644 (file)
--- a/tests/t2201-server-post-receive-email-tags.sh
+++ b/tests/t2201-server-post-receive-email-tags.sh
@@ -4,7 +4,7 @@ test_description='server post-receive email notification'
 
 . ./test-lib.sh
 
-export USER=author
+export USER_EMAIL=author@example.com
 
 test_expect_success 'setup' '
        echo "setup" >a &&
@@ -13,17 +13,16 @@ 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.post-receive-email.mailinglist commits@list.com &&
-       GIT_DIR=./server/.git git config --add hooks.post-receive-email.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_post_receive_hook 'post-receive-email'
 
-test_expect_success 'create tag' '
+test_expect_success 'create annotated tag' '
        git tag -a -m 1.0 1.0 &&
        git push --tags &&
        new_commit_hash=$(git rev-parse HEAD) &&
@@ -34,25 +33,29 @@ test_expect_success 'create tag' '
        test_cmp 1.txt server/.git/refs.tags.1.0.out
 '
 
-test_expect_success 'commit on tag branch' '
+test_expect_success 'commit on annotated tagged branch' '
        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" &&
        prior_commit_hash=$(git rev-parse HEAD) &&
        prior_commit_date=$(git log -n 1 --pretty=format:%cd HEAD) &&
+       prior_commit_abbrev=$(git rev-parse --short HEAD) &&
 
        echo "$test_name 2" >a &&
        git commit -a -m "$test_name 2" &&
        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) &&
 
        git push &&
        new_commit_abbrev=$(git rev-list -n 1 --pretty=format:%h HEAD | grep -v commit) &&
-       interpolate ../t2201-2.txt 2.txt old_commit_hash new_commit_hash new_commit_date new_commit_abbrev prior_commit_hash prior_commit_date &&
+       interpolate ../t2201-2.txt 2.txt old_commit_hash new_commit_hash new_commit_date new_commit_abbrev prior_commit_hash prior_commit_date old_commit_abbrev prior_commit_abbrev new_commit_abbrev &&
        test_cmp 2.txt server/.git/refs.heads.master.out
 '
 
-test_expect_success 'retag branch' '
+test_expect_success 're-annotated tag branch' '
        git tag -a -m 2.0 2.0 &&
        git push --tags &&
        new_commit_hash=$(git rev-parse HEAD) &&
@@ -63,10 +66,41 @@ test_expect_success 'retag branch' '
        test_cmp 3.txt server/.git/refs.tags.2.0.out
 '
 
+test_expect_success 'force update annotated tag' '
+       old_tag_hash=$(git rev-parse 2.0) &&
+
+       echo "$test_name" >a &&
+       git commit -a -m "$test_name" &&
+       new_commit_hash=$(git rev-parse HEAD) &&
+       new_commit_date=$(git log -n 1 --pretty=format:%cd HEAD) &&
+
+       git tag -f -a -m 2.0 2.0 &&
+       git push --tags &&
+       new_tag_hash=$(git rev-parse 2.0) &&
+       eval $(git for-each-ref --shell "--format=tag_date=%(taggerdate)" refs/tags/2.0) &&
+
+       interpolate ../t2201-7.txt 7.txt old_tag_hash new_commit_hash new_tag_hash tag_date &&
+       test_cmp 7.txt server/.git/refs.tags.2.0.out
+'
+
+test_expect_success 'delete annotated tag' '
+       old_tag_hash=$(git rev-parse 2.0) &&
+       eval $(git for-each-ref --shell "--format=old_tag_date=%(taggerdate)" refs/tags/2.0) &&
+
+       git tag -d 2.0 &&
+       git push origin :refs/tags/2.0 &&
+
+       new_commit_describe=$(git describe HEAD) &&
+       new_commit_hash=$(git rev-parse HEAD) &&
+
+       interpolate ../t2201-8.txt 8.txt old_tag_hash old_tag_date new_commit_describe new_commit_hash &&
+       test_cmp 8.txt server/.git/refs.tags.2.0.out
+'
+
 test_expect_success 'create lightweight tag' '
        echo "$test_name" >a &&
        git commit -a -m "$test_name" &&
-    git push &&
+       git push &&
 
        git tag 2.1 &&
        git push --tags &&
@@ -78,5 +112,31 @@ test_expect_success 'create lightweight tag' '
        test_cmp 4.txt server/.git/refs.tags.2.1.out
 '
 
+test_expect_success 'force update lightweight tag' '
+       old_commit_hash=$(git rev-parse HEAD) &&
+       echo "$test_name" >a &&
+       git commit -a -m "$test_name" &&
+       git push &&
+
+       git tag -f 2.1 &&
+       git push --tags &&
+       new_commit_hash=$(git rev-parse HEAD) &&
+       new_commit_describe=$(git describe HEAD) &&
+       new_commit_date=$(git rev-list --no-walk --pretty=format:%ad HEAD | tail -n 1) &&
+
+       interpolate ../t2201-5.txt 5.txt new_commit_hash new_commit_describe new_commit_date old_commit_hash &&
+       test_cmp 5.txt server/.git/refs.tags.2.1.out
+'
+
+test_expect_success 'delete lightweight tag' '
+       old_commit_hash=$(git rev-parse HEAD) &&
+       old_commit_describe=$(git describe HEAD) &&
+       git tag -d 2.1 &&
+       git push origin :refs/tags/2.1 &&
+
+       interpolate ../t2201-6.txt 6.txt old_commit_hash old_commit_describe &&
+       test_cmp 6.txt server/.git/refs.tags.2.1.out
+'
+
 test_done