1 files changed, 57 insertions, 16 deletions
diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh
index 0a703af149..61d08bb431 100755
--- a/t/t2200-add-update.sh
+++ b/t/t2200-add-update.sh
@@ -13,26 +13,67 @@ only the updates to dir/sub.'
 
 . ./test-lib.sh
 
-test_expect_success 'setup' '
-echo initial >top &&
-mkdir dir &&
-echo initial >dir/sub &&
-git add dir/sub top &&
-git-commit -m initial &&
-echo changed >top &&
-echo changed >dir/sub &&
-echo other >dir/other
+test_expect_success setup '
+	echo initial >check &&
+	echo initial >top &&
+	mkdir dir1 dir2 &&
+	echo initial >dir1/sub1 &&
+	echo initial >dir1/sub2 &&
+	echo initial >dir2/sub3 &&
+	git add check dir1 dir2 top &&
+	test_tick
+	git-commit -m initial &&
+
+	echo changed >check &&
+	echo changed >top &&
+	echo changed >dir2/sub3 &&
+	rm -f dir1/sub1 &&
+	echo other >dir2/other
 '
 
-test_expect_success 'update' 'git add -u dir'
+test_expect_success update '
+	git add -u dir1 dir2
+'
 
-test_expect_success 'update touched correct path' \
-  'test "`git diff-files --name-status dir/sub`" = ""'
+test_expect_success 'update noticed a removal' '
+	test "$(git-ls-files dir1/sub1)" = ""
+'
+
+test_expect_success 'update touched correct path' '
+	test "$(git-diff-files --name-status dir2/sub3)" = ""
+'
+
+test_expect_success 'update did not touch other tracked files' '
+	test "$(git-diff-files --name-status check)" = "M	check" &&
+	test "$(git-diff-files --name-status top)" = "M	top"
+'
+
+test_expect_success 'update did not touch untracked files' '
+	test "$(git-ls-files dir2/other)" = ""
+'
 
-test_expect_success 'update did not touch other tracked files' \
-  'test "`git diff-files --name-status top`" = "M	top"'
+test_expect_success 'cache tree has not been corrupted' '
 
-test_expect_success 'update did not touch untracked files' \
-  'test "`git diff-files --name-status dir/other`" = ""'
+	git ls-files -s |
+	sed -e "s/ 0	/	/" >expect &&
+	git ls-tree -r $(git write-tree) |
+	sed -e "s/ blob / /" >current &&
+	diff -u 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_done