diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-25 22:21:57 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-25 22:21:57 +0300 |
| commit | ff0cb70d456f586c94f15daa67d2ff1bb8e75fb6 (patch) | |
| tree | 0b59125cda2d1a4beba3a1410599223ba856f371 /builtin/commit.c | |
| parent | 12029dc57db23baef008e77db1909367599210ee (diff) | |
| parent | 509efef789de51f5d68e5c9799918f9a5ea09670 (diff) | |
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 'builtin/commit.c')
| -rw-r--r-- | builtin/commit.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index e48c1fd90a..aa1332308a 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -347,6 +347,9 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix if (interactive) die(_("--pathspec-from-file is incompatible with --interactive/--patch")); + if (all) + die(_("--pathspec-from-file with -a does not make sense")); + if (pathspec.nr) die(_("--pathspec-from-file is incompatible with pathspec arguments")); |