upload-pack: Use finish_{command,async}() instead of waitpid().

[git.git] / t / t2200-add-update.sh

diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh
index 4c7c6af432bd788350d322f2debc4bcea7f1636c..eb1ced3c371ecaeab9d0dc14be888bf7df110483 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 with path limiting
 
 This test creates a working tree state with three files:
 
@@ -8,7 +8,7 @@ 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
+and issues a git add -u with path limiting on "dir" to add
 only the updates to dir/sub.'
 
 . ./test-lib.sh
@@ -16,11 +16,12 @@ only the updates to dir/sub.'
 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 &&
 
@@ -62,4 +63,26 @@ test_expect_success 'cache tree has not been corrupted' '
 
 '
 
+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_done