fetch: allow explicit --refmap to override configuration

diff --git a/t/t5305-include-tag.sh b/t/t5305-include-tag.sh
index 0db27547ac9aa49c4b06ec371f6e04f5b9a7f16c..21517c70cd49ab91ab267544311d8c33173e3c3e 100755 (executable)
--- a/t/t5305-include-tag.sh
+++ b/t/t5305-include-tag.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description='git-pack-object --include-tag'
+test_description='git pack-object --include-tag'
 . ./test-lib.sh
 
 TRASH=`pwd`
@@ -45,12 +45,10 @@ test_expect_success 'unpack objects' '
 test_expect_success 'check unpacked result (have commit, no tag)' '
        git rev-list --objects $commit >list.expect &&
        (
-               GIT_DIR=clone.git &&
-               export GIT_DIR &&
-               test_must_fail git cat-file -e $tag &&
+               test_must_fail env GIT_DIR=clone.git git cat-file -e $tag &&
                git rev-list --objects $commit
        ) >list.actual &&
-       git diff list.expect list.actual
+       test_cmp list.expect list.actual
 '
 
 rm -rf clone.git
@@ -78,7 +76,7 @@ test_expect_success 'check unpacked result (have commit, have tag)' '
                export GIT_DIR &&
                git rev-list --objects $tag
        ) >list.actual &&
-       git diff list.expect list.actual
+       test_cmp list.expect list.actual
 '
 
 test_done