pretty: --format output should honor logOutputEncoding

diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index ece8fd5ab8523b087cbcd032100fda68a085adf1..dbb02e2afd16b2ca53f18107f5f07af37f217c9b 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
 
 if ! type "${BASH-bash}" >/dev/null 2>&1; then
        skip_all='skipping remote-testgit tests, bash not available'
@@ -63,18 +64,6 @@ test_expect_success 'fetch new branch' '
        compare_refs server HEAD local FETCH_HEAD
 '
 
-#
-# This is only needed because of a bug not detected by this script. It will be
-# fixed shortly, but for now lets not cause regressions.
-#
-test_expect_success 'bump commit in server' '
-       (cd server &&
-       git checkout master &&
-       echo content >>file &&
-       git commit -a -m four) &&
-       compare_refs server HEAD server HEAD
-'
-
 test_expect_success 'fetch multiple branches' '
        (cd local &&
         git fetch
@@ -170,4 +159,45 @@ test_expect_success 'push all with existing object' '
        compare_refs local dup2 server dup2
 '
 
+test_expect_success 'push ref with existing object' '
+       (cd local &&
+       git branch dup master &&
+       git push origin dup
+       ) &&
+       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 messages' '
+       (cd local &&
+       git checkout -b new_branch master &&
+       echo new >>file &&
+       git commit -a -m new &&
+       git push origin new_branch &&
+       git fetch origin &&
+       echo new >>file &&
+       git commit -a -m new &&
+       git push origin new_branch 2> msg &&
+       ! grep "\[new branch\]" msg
+       )
+'
+
 test_done