diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-01-30 23:17:08 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-01-30 23:17:08 +0100 |
| commit | 96aef8f68404964c48d0d85ce04f6b2d84097246 (patch) | |
| tree | 91c0f4bac02e2932ce5166586359c6b074a16b44 /t/t2072-restore-pathspec-file.sh | |
| parent | Merge branch 'ds/graph-horizontal-edges' (diff) | |
| parent | t: add tests for error conditions with --pathspec-from-file (diff) | |
| download | git-96aef8f68404964c48d0d85ce04f6b2d84097246.tar.xz git-96aef8f68404964c48d0d85ce04f6b2d84097246.zip | |
Merge branch 'am/test-pathspec-f-f-error-cases'
More tests.
* am/test-pathspec-f-f-error-cases:
t: add tests for error conditions with --pathspec-from-file
Diffstat (limited to 't/t2072-restore-pathspec-file.sh')
| -rwxr-xr-x | t/t2072-restore-pathspec-file.sh | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/t/t2072-restore-pathspec-file.sh b/t/t2072-restore-pathspec-file.sh index b407f6b779..0d47946e8a 100755 --- a/t/t2072-restore-pathspec-file.sh +++ b/t/t2072-restore-pathspec-file.sh @@ -143,4 +143,22 @@ test_expect_success 'only touches what was listed' ' verify_expect ' +test_expect_success 'error conditions' ' + restore_checkpoint && + echo fileA.t >list && + >empty_list && + + test_must_fail git restore --pathspec-from-file=list --patch --source=HEAD^1 2>err && + test_i18ngrep -e "--pathspec-from-file is incompatible with --patch" err && + + test_must_fail git restore --pathspec-from-file=list --source=HEAD^1 -- fileA.t 2>err && + test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err && + + test_must_fail git restore --pathspec-file-nul --source=HEAD^1 2>err && + test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err && + + test_must_fail git restore --pathspec-from-file=empty_list --source=HEAD^1 2>err && + test_i18ngrep -e "you must specify path(s) to restore" err +' + test_done |