Merge branch 'sp/fetch-fix'

diff --git a/t/t5701-clone-local.sh b/t/t5701-clone-local.sh
index b0933274db4ee73341bcc55e7d98fcddc3bae920..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
 '
 
@@ -43,4 +46,21 @@ test_expect_success 'local clone from x.git that does not exist' '
        fi
 '
 
+test_expect_success 'With -no-hardlinks, local will make a copy' '
+       cd "$D" &&
+       git clone --bare --no-hardlinks x w &&
+       cd w &&
+       linked=$(find objects -type f ! -links 1 | wc -l) &&
+       test 0 = $linked
+'
+
+test_expect_success 'Even without -l, local will make a hardlink' '
+       cd "$D" &&
+       rm -fr w &&
+       git clone -l --bare x w &&
+       cd w &&
+       copied=$(find objects -type f -links 1 | wc -l) &&
+       test 0 = $copied
+'
+
 test_done