Merge branch 'tg/index-v4-format'

diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh
index 9bf2bdffd24b773a2eec636efdd534269f45e74b..e16b15d3e5784eb3c6423318142cb91fe3a58601 100755 (executable)
--- a/t/t2200-add-update.sh
+++ b/t/t2200-add-update.sh
@@ -80,18 +80,13 @@ test_expect_success 'change gets noticed' '
 
 '
 
-# Note that this is scheduled to change in Git 2.0, when
-# "git add -u" will become full-tree by default.
-test_expect_success 'non-limited update in subdir leaves root alone' '
+test_expect_success 'non-qualified update in subdir updates from the root' '
        (
                cd dir1 &&
                echo even more >>sub2 &&
                git add -u
        ) &&
-       cat >expect <<-\EOF &&
-       check
-       top
-       EOF
+       : >expect &&
        git diff-files --name-only >actual &&
        test_cmp expect actual
 '