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

diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index ad8cc7d4ae88e2066d2f51b6a6a5a192780d5e9a..0d80c6aeadf30b0d4a9f9e8dc79f37d99e4b6068 100755 (executable)
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -110,4 +110,30 @@ 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