summaryrefslogtreecommitdiff
path: root/builtin/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-12-25 19:21:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-12-25 19:21:57 (GMT)
commitff0cb70d456f586c94f15daa67d2ff1bb8e75fb6 (patch)
tree0b59125cda2d1a4beba3a1410599223ba856f371 /builtin/commit.c
parent12029dc57db23baef008e77db1909367599210ee (diff)
parent509efef789de51f5d68e5c9799918f9a5ea09670 (diff)
downloadgit-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 'builtin/commit.c')
-rw-r--r--builtin/commit.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/commit.c b/builtin/commit.c
index e48c1fd..aa13323 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"));