diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-22 18:23:06 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-22 18:23:07 (GMT) |
| commit | 06cbc13c6cb8867af1127ac52e005b3c36506320 (patch) | |
| tree | 2067203fdbf3d06f08f9795458908aa4921eac00 /t | |
| parent | 805c5a578995db7594ad0751a683bc6422655c29 (diff) | |
| parent | 76b623584cee2421b84e12050b7ee53b0c08ee89 (diff) | |
| download | git-06cbc13c6cb8867af1127ac52e005b3c36506320.zip git-06cbc13c6cb8867af1127ac52e005b3c36506320.tar.gz git-06cbc13c6cb8867af1127ac52e005b3c36506320.tar.bz2 | |
Merge branch 'jc/simple-add-must-be-a-no-op'
This detected a mismerge of one of "add-2.0" topics to the 'jch'
and 'pu' branches.
* jc/simple-add-must-be-a-no-op:
t2202: make sure "git add" (no args) stays a no-op
Diffstat (limited to 't')
| -rwxr-xr-x | t/t2202-add-addremove.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t2202-add-addremove.sh b/t/t2202-add-addremove.sh index 6a81510..fc8b59e 100755 --- a/t/t2202-add-addremove.sh +++ b/t/t2202-add-addremove.sh @@ -41,4 +41,14 @@ test_expect_success 'git add --all' ' test_cmp expect actual ' +test_expect_success 'Just "git add" is a no-op' ' + git reset --hard && + echo >will-remove && + >will-not-be-added && + git add && + git diff-index --name-status --cached HEAD >actual && + >expect && + test_cmp expect actual +' + test_done |