diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-07-22 13:03:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-22 13:03:52 -0700 |
| commit | c9603dfae5856aba6a8ed64719a2e73da066ad84 (patch) | |
| tree | 29ed018ebb2a169e616cf30a052537620eff76b9 | |
| parent | Merge branch 'jk/maint-commit-amend-only-no-paths' into maint (diff) | |
| parent | Allow edit of empty message with commit --amend (diff) | |
| download | tgif-c9603dfae5856aba6a8ed64719a2e73da066ad84.tar.xz | |
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
| -rw-r--r-- | builtin/commit.c | 2 | ||||
| -rwxr-xr-x | t/t7501-commit.sh | 15 |
2 files changed, 16 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"; diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh index 3f364a20e8..195e7477d8 100755 --- a/t/t7501-commit.sh +++ b/t/t7501-commit.sh @@ -148,6 +148,21 @@ test_expect_success '--amend --edit' ' test_cmp expect msg ' +test_expect_success '--amend --edit of empty message' ' + cat >replace <<-\EOF && + #!/bin/sh + echo "amended" >"$1" + EOF + chmod 755 replace && + git commit --allow-empty --allow-empty-message -m "" && + echo more bongo >file && + git add file && + EDITOR=./replace git commit --edit --amend && + git diff-tree -s --format=%s HEAD >msg && + ./replace expect && + test_cmp expect msg +' + test_expect_success '-m --edit' ' echo amended >expect && git commit --allow-empty -m buffer && |