diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-01-17 15:11:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-17 15:11:03 -0800 |
| commit | 9d2a24864e8f0a1ab2fc6b72c64a4f1d4aa9fe94 (patch) | |
| tree | 8433cce3f129be82632e1c71f4d6744d7fb61d8f /builtin | |
| parent | Merge branch 'da/difftool-dir-diff-fix' into maint (diff) | |
| parent | commit: remove 'Clever' message for --only --amend (diff) | |
| download | tgif-9d2a24864e8f0a1ab2fc6b72c64a4f1d4aa9fe94.tar.xz | |
Merge branch 'ak/commit-only-allow-empty' into maint
"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')
| -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 8976c3d29b..276c74034e 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")) |