diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-22 22:03:52 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-22 22:03:52 +0200 |
| commit | c9603dfae5856aba6a8ed64719a2e73da066ad84 (patch) | |
| tree | 29ed018ebb2a169e616cf30a052537620eff76b9 /builtin/commit.c | |
| parent | Merge branch 'jk/maint-commit-amend-only-no-paths' into maint (diff) | |
| parent | Allow edit of empty message with commit --amend (diff) | |
| download | git-c9603dfae5856aba6a8ed64719a2e73da066ad84.tar.xz git-c9603dfae5856aba6a8ed64719a2e73da066ad84.zip | |
Merge branch 'cw/amend-commit-without-message' into maint
"commit --amend" used to refuse amending a commit with an empty log
message, with or without "--allow-empty-message".
* cw/amend-commit-without-message:
Allow edit of empty message with commit --amend
Diffstat (limited to 'builtin/commit.c')
| -rw-r--r-- | builtin/commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 3c3385cded..95eeab1d51 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -643,7 +643,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix, hook_arg1 = "message"; } else if (use_message) { buffer = strstr(use_message_buffer, "\n\n"); - if (!buffer || buffer[2] == '\0') + if (!use_editor && (!buffer || buffer[2] == '\0')) die(_("commit has empty message")); strbuf_add(&sb, buffer + 2, strlen(buffer + 2)); hook_arg1 = "commit"; |