diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-12-19 14:45:34 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-19 14:45:34 -0800 |
| commit | 3aead1cad7a9a35534b86763bbe8c97dfd3f1a03 (patch) | |
| tree | dbfbcae1d285ce8e6e7d51b45285f712191e0662 /builtin/commit.c | |
| parent | afe0e2a391665c01daae78d8f8a9a105420b0218 (diff) | |
| parent | beb635ca9ced5cd8f0eb5d2def9468f14bd243bc (diff) | |
| download | git-3aead1cad7a9a35534b86763bbe8c97dfd3f1a03.tar.gz | |
Merge branch 'ak/commit-only-allow-empty'
"git commit --allow-empty --only" (no pathspec) with dirty index
ought to be an acceptable way to create a new commit that does not
change any paths, but it was forbidden, perhaps because nobody
needed it so far.
* ak/commit-only-allow-empty:
commit: remove 'Clever' message for --only --amend
commit: make --only --allow-empty work without paths
Diffstat (limited to 'builtin/commit.c')
| -rw-r--r-- | builtin/commit.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 887ccc7577..0ed634b26c 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1206,10 +1206,8 @@ static int parse_and_validate_options(int argc, const char *argv[], if (also + only + all + interactive > 1) die(_("Only one of --include/--only/--all/--interactive/--patch can be used.")); - if (argc == 0 && (also || (only && !amend))) + if (argc == 0 && (also || (only && !amend && !allow_empty))) die(_("No paths with --include/--only does not make sense.")); - if (argc == 0 && only && amend) - only_include_assumed = _("Clever... amending the last one with dirty index."); if (argc > 0 && !also && !only) only_include_assumed = _("Explicit paths specified without -i or -o; assuming --only paths..."); if (!cleanup_arg || !strcmp(cleanup_arg, "default")) |