kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2019-12-25 11:21:57 -08:00
parent 12029dc57d 509efef789
commit ff0cb70d45
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/commit.c
View File

@ -347,6 +347,9 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
if (interactive) if (interactive)
die(_("--pathspec-from-file is incompatible with --interactive/--patch")); die(_("--pathspec-from-file is incompatible with --interactive/--patch"));


if (all)
die(_("--pathspec-from-file with -a does not make sense"));

if (pathspec.nr) if (pathspec.nr)
die(_("--pathspec-from-file is incompatible with pathspec arguments")); die(_("--pathspec-from-file is incompatible with pathspec arguments"));



6
t/t7526-commit-pathspec-file.sh
View File

@ -127,4 +127,10 @@ test_expect_success 'only touches what was listed' '
verify_expect 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 test_done