Fix tests breaking when checkout path contains shell metacharacters

diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh
index 4c7c6af432bd788350d322f2debc4bcea7f1636c..b664341926071a3286ba949dc09b5e62b280e79a 100755 (executable)
--- a/t/t2200-add-update.sh
+++ b/t/t2200-add-update.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description='git-add -u with path limiting
+test_description='git add -u
 
 This test creates a working tree state with three files:
 
@@ -8,19 +8,23 @@ This test creates a working tree state with three files:
   dir/sub (previously committed, modified)
   dir/other (untracked)
 
-and issues a git-add -u with path limiting on "dir" to add
-only the updates to dir/sub.'
+and issues a git add -u with path limiting on "dir" to add
+only the updates to dir/sub.
+
+Also tested are "git add -u" without limiting, and "git add -u"
+without contents changes.'
 
 . ./test-lib.sh
 
 test_expect_success setup '
        echo initial >check &&
        echo initial >top &&
+       echo initial >foo &&
        mkdir dir1 dir2 &&
        echo initial >dir1/sub1 &&
        echo initial >dir1/sub2 &&
        echo initial >dir2/sub3 &&
-       git add check dir1 dir2 top &&
+       git add check dir1 dir2 top foo &&
        test_tick
        git-commit -m initial &&
 
@@ -58,7 +62,52 @@ test_expect_success 'cache tree has not been corrupted' '
        sed -e "s/ 0    /       /" >expect &&
        git ls-tree -r $(git write-tree) |
        sed -e "s/ blob / /" >current &&
-       diff -u expect current
+       test_cmp expect current
+
+'
+
+test_expect_success 'update from a subdirectory' '
+       (
+               cd dir1 &&
+               echo more >sub2 &&
+               git add -u sub2
+       )
+'
+
+test_expect_success 'change gets noticed' '
+
+       test "$(git diff-files --name-status dir1)" = ""
+
+'
+
+test_expect_success 'replace a file with a symlink' '
+
+       rm foo &&
+       ln -s top foo &&
+       git add -u -- foo
+
+'
+
+test_expect_success 'add everything changed' '
+
+       git add -u &&
+       test -z "$(git diff-files)"
+
+'
+
+test_expect_success 'touch and then add -u' '
+
+       touch check &&
+       git add -u &&
+       test -z "$(git diff-files)"
+
+'
+
+test_expect_success 'touch and then add explicitly' '
+
+       touch check &&
+       git add check &&
+       test -z "$(git diff-files)"
 
 '