summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-16 04:39:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-07-16 04:39:38 (GMT)
commit8647b585d899bc7458fbc5c12c2c44331da5b4c0 (patch)
tree7f465aa5aecfc0b9795808b22b94bd3bb39d050e
parentd06414b9ce66137a7c7464fbc6ce3512c51dc3de (diff)
parentd9a93575722d9ea918f090892b06618ddf0d1d65 (diff)
downloadgit-8647b585d899bc7458fbc5c12c2c44331da5b4c0.zip
git-8647b585d899bc7458fbc5c12c2c44331da5b4c0.tar.gz
git-8647b585d899bc7458fbc5c12c2c44331da5b4c0.tar.bz2
Merge branch 'cw/amend-commit-without-message'
"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.c2
-rwxr-xr-xt/t7501-commit.sh15
2 files changed, 16 insertions, 1 deletions
diff --git a/builtin/commit.c b/builtin/commit.c
index f43eaaf..6515da2 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -640,7 +640,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 676da85..0f83be8 100755
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -138,6 +138,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 &&