summaryrefslogtreecommitdiff
path: root/t/t2200-add-update.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-08-15 21:38:38 -0700
committerJunio C Hamano <gitster@pobox.com>2007-08-15 21:38:38 -0700
commitc576304d512df18fa30b91bb3ac15478d5d4dfb1 (patch)
treea0be3b2ce5c20da4468433dfa6357c5357951e6f /t/t2200-add-update.sh
parentf34f2b0b384b42f7a0d0d92966c145b05fe55217 (diff)
parentb13ef4916ac5a25cc5897f85ba0b4c5953cff609 (diff)
downloadgit-c576304d512df18fa30b91bb3ac15478d5d4dfb1.tar.gz
Merge branch 'maint' to sync with 1.5.2.5
* maint: GIT 1.5.2.5 git-add -u paths... now works from subdirectory Fix "git add -u" data corruption.
Diffstat (limited to 't/t2200-add-update.sh')
-rwxr-xr-xt/t2200-add-update.sh73
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