Correct handling of branch.$name.merge in builtin-fetch

diff --git a/t/t5701-clone-local.sh b/t/t5701-clone-local.sh
index a3026ec4fcc653ff6a5a14bd84c1b3cc92078b6b..822ac8c28e112dc1da61cb7fecdab1b4f25717ec 100755 (executable)
--- a/t/t5701-clone-local.sh
+++ b/t/t5701-clone-local.sh
@@ -8,13 +8,16 @@ D=`pwd`
 test_expect_success 'preparing origin repository' '
        : >file && git add . && git commit -m1 &&
        git clone --bare . a.git &&
-       git clone --bare . x
+       git clone --bare . x &&
+       test "$(GIT_CONFIG=a.git/config git config --bool core.bare)" = true &&
+       test "$(GIT_CONFIG=x/config git config --bool core.bare)" = true
 '
 
 test_expect_success 'local clone without .git suffix' '
        cd "$D" &&
        git clone -l -s a b &&
        cd b &&
+       test "$(GIT_CONFIG=.git/config git config --bool core.bare)" = false &&
        git fetch
 '
 
@@ -48,7 +51,7 @@ test_expect_success 'With -no-hardlinks, local will make a copy' '
        git clone --bare --no-hardlinks x w &&
        cd w &&
        linked=$(find objects -type f ! -links 1 | wc -l) &&
-       test "$linked" = 0
+       test 0 = $linked
 '
 
 test_expect_success 'Even without -l, local will make a hardlink' '
@@ -57,7 +60,7 @@ test_expect_success 'Even without -l, local will make a hardlink' '
        git clone -l --bare x w &&
        cd w &&
        copied=$(find objects -type f -links 1 | wc -l) &&
-       test "$copied" = 0
+       test 0 = $copied
 '
 
 test_done