diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-02-12 22:42:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-12 22:42:10 -0800 |
| commit | 44a1020d4d41b90be80745c7a16e2a49fa612b56 (patch) | |
| tree | fd734df8e43fb1dc956ac045eb0a699d09fb1176 /t | |
| parent | Merge branch 'jk/maint-tag-show-fixes' (diff) | |
| parent | commit: ignore intent-to-add entries instead of refusing (diff) | |
| download | tgif-44a1020d4d41b90be80745c7a16e2a49fa612b56.tar.xz | |
Merge branch 'jc/maint-commit-ignore-i-t-a'
* jc/maint-commit-ignore-i-t-a:
commit: ignore intent-to-add entries instead of refusing
Conflicts:
cache-tree.c
Diffstat (limited to 't')
| -rwxr-xr-x | t/t2203-add-intent.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh index 25435290a7..ec35409f9c 100755 --- a/t/t2203-add-intent.sh +++ b/t/t2203-add-intent.sh @@ -32,7 +32,7 @@ test_expect_success 'intent to add does not clobber existing paths' ' ! grep "$empty" actual ' -test_expect_success 'cannot commit with i-t-a entry' ' +test_expect_success 'i-t-a entry is simply ignored' ' test_tick && git commit -a -m initial && git reset --hard && @@ -41,12 +41,14 @@ test_expect_success 'cannot commit with i-t-a entry' ' echo frotz >nitfol && git add rezrov && git add -N nitfol && - test_must_fail git commit -m initial + git commit -m second && + test $(git ls-tree HEAD -- nitfol | wc -l) = 0 && + test $(git diff --name-only HEAD -- nitfol | wc -l) = 1 ' test_expect_success 'can commit with an unrelated i-t-a entry in index' ' git reset --hard && - echo xyzzy >rezrov && + echo bozbar >rezrov && echo frotz >nitfol && git add rezrov && git add -N nitfol && |