diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-05-02 21:24:09 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-02 21:24:09 (GMT) |
| commit | 12c5cd774e26acfea66e19e8fba53faf9507322f (patch) | |
| tree | a15dbe4943d43ecebf72fd791b1023c1e1576dac /builtin | |
| parent | f5e16b2a7ba0ed12e4674f111386643e16692fe9 (diff) | |
| parent | 27014cbc04e369624f6c1754b72ef4eddb911166 (diff) | |
| download | git-12c5cd774e26acfea66e19e8fba53faf9507322f.zip git-12c5cd774e26acfea66e19e8fba53faf9507322f.tar.gz git-12c5cd774e26acfea66e19e8fba53faf9507322f.tar.bz2 | |
Merge branch 'ad/commit-have-m-option' into maint
"git commit" misbehaved in a few minor ways when an empty message
is given via -m '', all of which has been corrected.
* ad/commit-have-m-option:
commit: do not ignore an empty message given by -m ''
commit: --amend -m '' silently fails to wipe message
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/commit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index c733ec9..e133037 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -694,7 +694,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix, } } - if (message.len) { + if (have_option_m) { strbuf_addbuf(&sb, &message); hook_arg1 = "message"; } else if (logfile && !strcmp(logfile, "-")) { @@ -1171,9 +1171,9 @@ static int parse_and_validate_options(int argc, const char *argv[], f++; if (f > 1) die(_("Only one of -c/-C/-F/--fixup can be used.")); - if (message.len && f > 0) + if (have_option_m && f > 0) die((_("Option -m cannot be combined with -c/-C/-F/--fixup."))); - if (f || message.len) + if (f || have_option_m) template_file = NULL; if (edit_message) use_message = edit_message; |