Merge branch 'an/diff-index-doc'

diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index 0a83db8875cc221906ce292dd6247a0323ac6348..4899af3f7abfb567017e0d64c7961c22beb5b749 100755 (executable)
--- a/t/t5801-remote-helpers.sh
+++ b/t/t5801-remote-helpers.sh
@@ -6,6 +6,7 @@
 test_description='Test remote-helper import and export commands'
 
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-gpg.sh
 
 compare_refs() {
        git --git-dir="$1/.git" rev-parse --verify $2 >expect &&
@@ -150,18 +151,51 @@ test_expect_success 'push ref with existing object' '
        compare_refs local dup server dup
 '
 
+test_expect_success GPG 'push signed tag' '
+       (cd local &&
+       git checkout master &&
+       git tag -s -m signed-tag signed-tag &&
+       git push origin signed-tag
+       ) &&
+       compare_refs local signed-tag^{} server signed-tag^{} &&
+       test_must_fail compare_refs local signed-tag server signed-tag
+'
+
+test_expect_success GPG 'push signed tag with signed-tags capability' '
+       (cd local &&
+       git checkout master &&
+       git tag -s -m signed-tag signed-tag-2 &&
+       GIT_REMOTE_TESTGIT_SIGNED_TAGS=1 git push origin signed-tag-2
+       ) &&
+       compare_refs local signed-tag-2 server signed-tag-2
+'
+
 test_expect_success 'push update refs' '
        (cd local &&
        git checkout -b update master &&
        echo update >>file &&
        git commit -a -m update &&
-       git push origin update
+       git push origin update &&
        git rev-parse --verify remotes/origin/update >expect &&
        git rev-parse --verify testgit/origin/heads/update >actual &&
        test_cmp expect actual
        )
 '
 
+test_expect_success 'push update refs failure' '
+       (cd local &&
+       git checkout update &&
+       echo "update fail" >>file &&
+       git commit -a -m "update fail" &&
+       git rev-parse --verify testgit/origin/heads/update >expect &&
+       GIT_REMOTE_TESTGIT_PUSH_ERROR="non-fast forward" &&
+       export GIT_REMOTE_TESTGIT_PUSH_ERROR &&
+       test_expect_code 1 git push origin update &&
+       git rev-parse --verify testgit/origin/heads/update >actual &&
+       test_cmp expect actual
+       )
+'
+
 test_expect_success 'proper failure checks for fetching' '
        (GIT_REMOTE_TESTGIT_FAILURE=1 &&
        export GIT_REMOTE_TESTGIT_FAILURE &&