From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 Jun 2014 18:16:04 +0000 (-0700)
Subject: Merge branch 'jk/commit-C-pick-empty'
X-Git-Tag: v2.1.0-rc0~177
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e88155d1e1c3b55ed1f78425b0c2e5a09eea29dd?ds=sidebyside;hp=--cc

Merge branch 'jk/commit-C-pick-empty'

"git commit --allow-empty-message -C $commit" did not work when the
commit did not have any log message.

* jk/commit-C-pick-empty:
commit: do not complain of empty messages from -C
---

e88155d1e1c3b55ed1f78425b0c2e5a09eea29dd
diff --cc builtin/commit.c
index caec5c0e18,aa04507174..0320efd57d
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@@ -674,11 -649,9 +674,10 @@@ static int prepare_to_commit(const cha
  				  logfile);
  		hook_arg1 = "message";
  	} else if (use_message) {
 +		char *buffer;
  		buffer = strstr(use_message_buffer, "\n\n");
- 		if (!use_editor && (!buffer || buffer[2] == '\0'))
- 			die(_("commit has empty message"));
- 		strbuf_add(&sb, buffer + 2, strlen(buffer + 2));
+ 		if (buffer)
+ 			strbuf_add(&sb, buffer + 2, strlen(buffer + 2));
  		hook_arg1 = "commit";
  		hook_arg2 = use_message;
  	} else if (fixup_message) {