Fix t5516-fetch for systems where `wc -l` outputs whitespace.

diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index caaab26c2f3f2d04581a6c6918ab36f97a51f975..0d80c6aeadf30b0d4a9f9e8dc79f37d99e4b6068 100755 (executable)
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -30,6 +30,16 @@ test_expect_success \
         *) echo fail; git-ls-files --stage xfoo1; (exit 1);;
         esac'
 
+test_expect_success 'git-add: filemode=0 should not get confused by symlink' '
+       rm -f xfoo1 &&
+       ln -s foo xfoo1 &&
+       git-add xfoo1 &&
+       case "`git-ls-files --stage xfoo1`" in
+       120000" "*xfoo1) echo ok;;
+       *) echo fail; git-ls-files --stage xfoo1; (exit 1);;
+       esac
+'
+
 test_expect_success \
        'git-update-index --add: Test that executable bit is not used...' \
        'git config core.filemode 0 &&
@@ -41,6 +51,16 @@ test_expect_success \
         *) echo fail; git-ls-files --stage xfoo2; (exit 1);;
         esac'
 
+test_expect_success 'git-add: filemode=0 should not get confused by symlink' '
+       rm -f xfoo2 &&
+       ln -s foo xfoo2 &&
+       git update-index --add xfoo2 &&
+       case "`git-ls-files --stage xfoo2`" in
+       120000" "*xfoo2) echo ok;;
+       *) echo fail; git-ls-files --stage xfoo2; (exit 1);;
+       esac
+'
+
 test_expect_success \
        'git-update-index --add: Test that executable bit is not used...' \
        'git config core.filemode 0 &&
@@ -84,4 +104,36 @@ test_expect_success 'add ignored ones with -f' '
        git-ls-files --error-unmatch d.ig/d.if d.ig/d.ig
 '
 
+mkdir 1 1/2 1/3
+touch 1/2/a 1/3/b 1/2/c
+test_expect_success 'check correct prefix detection' '
+       git add 1/2/a 1/3/b 1/2/c
+'
+
+test_expect_success 'git add and filemode=0 with unmerged entries' '
+       echo 1 > stage1 &&
+       echo 2 > stage2 &&
+       echo 3 > stage3 &&
+       for s in 1 2 3
+       do
+               echo "100755 $(git hash-object -w stage$s) $s   file"
+       done | git update-index --index-info &&
+       git config core.filemode 0 &&
+       echo new > file &&
+       git add file &&
+       git ls-files --stage | grep "^100755 .* 0       file$"
+'
+
+test_expect_success 'git add and filemode=0 prefers stage 2 over stage 1' '
+       git rm --cached -f file &&
+       (
+               echo "100644 $(git hash-object -w stage1) 1     file"
+               echo "100755 $(git hash-object -w stage2) 2     file"
+       ) | git update-index --index-info &&
+       git config core.filemode 0 &&
+       echo new > file &&
+       git add file &&
+       git ls-files --stage | grep "^100755 .* 0       file$"
+'
+
 test_done