diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-22 18:11:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-22 18:11:45 (GMT) |
| commit | 561954bfa1c1a1c5a76ca59001da331c73c5c141 (patch) | |
| tree | 359128415d7d23c48467dfc6db5461977d826338 /t/t2200-add-update.sh | |
| parent | de0d774d46b3731ea22567efc4aaf1fc8f5ac919 (diff) | |
| parent | ccc663bc24a3925b818df0ce97a5ba47e221f383 (diff) | |
| download | git-561954bfa1c1a1c5a76ca59001da331c73c5c141.zip git-561954bfa1c1a1c5a76ca59001da331c73c5c141.tar.gz git-561954bfa1c1a1c5a76ca59001da331c73c5c141.tar.bz2 | |
Merge branch 'jc/add-2.0-delete-default' (early part)
Preparatory steps to make "git add <pathspec>" take notice of
removed paths that match <pathspec> by default in Git 2.0.
* 'jc/add-2.0-delete-default' (early part):
git add: rephrase the "removal will cease to be ignored" warning
git add: rework the logic to warn "git add <pathspec>..." default change
git add: start preparing for "git add <pathspec>..." to default to "-A"
builtin/add.c: simplify boolean variables
Diffstat (limited to 't/t2200-add-update.sh')
| -rwxr-xr-x | t/t2200-add-update.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh index c317254..b2bd419 100755 --- a/t/t2200-add-update.sh +++ b/t/t2200-add-update.sh @@ -166,9 +166,9 @@ test_expect_success 'add -u resolves unmerged paths' ' echo 2 >path3 && echo 2 >path5 && - # Explicit resolving by adding removed paths should fail - test_must_fail git add path4 && - test_must_fail git add path6 && + # Fail to explicitly resolve removed paths with "git add" + test_must_fail git add --no-all path4 && + test_must_fail git add --no-all path6 && # "add -u" should notice removals no matter what stages # the index entries are in. |