diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-25 19:21:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-25 19:21:57 (GMT) |
| commit | ff0cb70d456f586c94f15daa67d2ff1bb8e75fb6 (patch) | |
| tree | 0b59125cda2d1a4beba3a1410599223ba856f371 /t | |
| parent | 12029dc57db23baef008e77db1909367599210ee (diff) | |
| parent | 509efef789de51f5d68e5c9799918f9a5ea09670 (diff) | |
| download | git-ff0cb70d456f586c94f15daa67d2ff1bb8e75fb6.zip git-ff0cb70d456f586c94f15daa67d2ff1bb8e75fb6.tar.gz git-ff0cb70d456f586c94f15daa67d2ff1bb8e75fb6.tar.bz2 | |
Merge branch 'am/pathspec-from-file'
An earlier series to teach "--pathspec-from-file" to "git commit"
forgot to make the option incompatible with "--all", which has been
corrected.
* am/pathspec-from-file:
commit: forbid --pathspec-from-file --all
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7526-commit-pathspec-file.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t7526-commit-pathspec-file.sh b/t/t7526-commit-pathspec-file.sh index a06b683..4b58901 100755 --- a/t/t7526-commit-pathspec-file.sh +++ b/t/t7526-commit-pathspec-file.sh @@ -127,4 +127,10 @@ test_expect_success 'only touches what was listed' ' verify_expect ' +test_expect_success '--pathspec-from-file and --all cannot be used together' ' + restore_checkpoint && + test_must_fail git commit --pathspec-from-file=- --all -m "Commit" 2>err && + test_i18ngrep "[-]-pathspec-from-file with -a does not make sense" err +' + test_done |