From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 9 May 2010 05:36:31 +0000 (-0700)
Subject: Merge branch 'ab/commit-empty-message'
X-Git-Tag: v1.7.2-rc0~151
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ea28baed79981e065a5a6d39323c4fb7d2b51685?ds=inline;hp=-c

Merge branch 'ab/commit-empty-message'

* ab/commit-empty-message:
Add option to git-commit to allow empty log messages
---

ea28baed79981e065a5a6d39323c4fb7d2b51685
diff --combined builtin/commit.c
index 3c14ade9dd,821a49dac8..017b8a5536
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@@ -66,7 -66,7 +66,7 @@@ static char *edit_message, *use_message
  static char *author_name, *author_email, *author_date;
  static int all, edit_flag, also, interactive, only, amend, signoff;
  static int quiet, verbose, no_verify, allow_empty, dry_run, renew_authorship;
- static int no_post_rewrite;
+ static int no_post_rewrite, allow_empty_message;
  static char *untracked_files_arg, *force_date;
  /*
   * The default commit message cleanup mode will remove the lines
@@@ -140,9 -140,15 +140,15 @@@ static struct option builtin_commit_opt
  	OPT_BOOLEAN(0, "amend", &amend, "amend previous commit"),
  	OPT_BOOLEAN(0, "no-post-rewrite", &no_post_rewrite, "bypass post-rewrite hook"),
  	{ OPTION_STRING, 'u', "untracked-files", &untracked_files_arg, "mode", "show untracked files, optional modes: all, normal, no. (Default: all)", PARSE_OPT_OPTARG, NULL, (intptr_t)"all" },
- 	OPT_BOOLEAN(0, "allow-empty", &allow_empty, "ok to record an empty change"),
  	/* end commit contents options */
  
+ 	{ OPTION_BOOLEAN, 0, "allow-empty", &allow_empty, NULL,
+ 	  "ok to record an empty change",
+ 	  PARSE_OPT_NOARG | PARSE_OPT_HIDDEN },
+ 	{ OPTION_BOOLEAN, 0, "allow-empty-message", &allow_empty_message, NULL,
+ 	  "ok to record a change with an empty message",
+ 	  PARSE_OPT_NOARG | PARSE_OPT_HIDDEN },
+ 
  	OPT_END()
  };
  
@@@ -1017,7 -1023,6 +1023,7 @@@ static int git_status_config(const cha
  int cmd_status(int argc, const char **argv, const char *prefix)
  {
  	struct wt_status s;
 +	int fd;
  	unsigned char sha1[20];
  	static struct option builtin_status_options[] = {
  		OPT__VERBOSE(&verbose),
@@@ -1051,14 -1056,6 +1057,14 @@@
  
  	read_cache_preload(s.pathspec);
  	refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, s.pathspec, NULL, NULL);
 +
 +	fd = hold_locked_index(&index_lock, 0);
 +	if (0 <= fd) {
 +		if (!write_cache(fd, active_cache, active_nr))
 +			commit_locked_index(&index_lock);
 +		rollback_lock_file(&index_lock);
 +	}
 +
  	s.is_initial = get_sha1(s.reference, sha1) ? 1 : 0;
  	s.in_merge = in_merge;
  	wt_status_collect(&s);
@@@ -1302,7 -1299,7 +1308,7 @@@ int cmd_commit(int argc, const char **a
  
  	if (cleanup_mode != CLEANUP_NONE)
  		stripspace(&sb, cleanup_mode == CLEANUP_ALL);
- 	if (message_is_empty(&sb)) {
+ 	if (message_is_empty(&sb) && !allow_empty_message) {
  		rollback_index_files();
  		fprintf(stderr, "Aborting commit due to empty commit message.\n");
  		exit(1);