diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-10 15:32:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-10 15:32:02 -0800 |
| commit | e25ccff14071ec3628153992acc82b9922e16938 (patch) | |
| tree | 28a2b00d582e415fe08453558bd91a2f17c872e9 /t | |
| parent | c88cd03edb4553c726a488a57df5d482cbada9ce (diff) | |
| parent | 1e7ef746d3a635742690817fefe00b66a044dfe5 (diff) | |
| download | git-e25ccff14071ec3628153992acc82b9922e16938.tar.gz git-e25ccff14071ec3628153992acc82b9922e16938.tar.xz | |
Merge branch 'cp/add-u-pathspec'
* cp/add-u-pathspec:
test for add with non-existent pathspec
git add -u: die on unmatched pathspec
Diffstat (limited to 't')
| -rwxr-xr-x | t/t2200-add-update.sh | 5 | ||||
| -rwxr-xr-x | t/t3700-add.sh | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh index 912075063..2ad2819a3 100755 --- a/t/t2200-add-update.sh +++ b/t/t2200-add-update.sh @@ -176,4 +176,9 @@ test_expect_success 'add -u resolves unmerged paths' ' ' +test_expect_success '"add -u non-existent" should fail' ' + test_must_fail git add -u non-existent && + ! (git ls-files | grep "non-existent") +' + test_done diff --git a/t/t3700-add.sh b/t/t3700-add.sh index 85eb0fbf9..525c9a8fd 100755 --- a/t/t3700-add.sh +++ b/t/t3700-add.sh @@ -255,4 +255,9 @@ test_expect_success 'git add to resolve conflicts on otherwise ignored path' ' git add track-this ' +test_expect_success '"add non-existent" should fail' ' + test_must_fail git add non-existent && + ! (git ls-files | grep "non-existent") +' + test_done |