summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2013-03-14 02:44:04 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-03-14 08:24:12 -0700
commit7bf7a92f69f8b0af7169af390e53397698fcfa95 (patch)
tree4c66940a60833b7dcc741592cbc8f927dfe4061c /t
parentMerge branch 'mm/add-u-A-finishing-touches' (diff)
downloadtgif-7bf7a92f69f8b0af7169af390e53397698fcfa95.tar.xz
t2200: check that "add -u" limits itself to subdirectory
This behavior is due to change in the future, but let's test it anyway. That helps make sure we do not accidentally switch the behavior too soon while we are working in the area, and it means that we can easily verify the change when we do make it. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t2200-add-update.sh16
1 files changed, 16 insertions, 0 deletions
diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh
index 4cdebda6a5..c317254b9a 100755
--- a/t/t2200-add-update.sh
+++ b/t/t2200-add-update.sh
@@ -80,6 +80,22 @@ 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' '
+ (
+ cd dir1 &&
+ echo even more >>sub2 &&
+ git add -u
+ ) &&
+ cat >expect <<-\EOF &&
+ check
+ top
+ EOF
+ git diff-files --name-only >actual &&
+ test_cmp expect actual
+'
+
test_expect_success SYMLINKS 'replace a file with a symlink' '
rm foo &&