From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 20 Sep 2013 19:36:31 +0000 (-0700)
Subject: Merge branch 'mm/commit-template-squelch-advice-messages'
X-Git-Tag: v1.8.5-rc0~93
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b4980c63acad8457fb3606b9bd8b74d5e7cba8dd

Merge branch 'mm/commit-template-squelch-advice-messages'

From the commit log template, remove irrelevant "advice" messages
that are shared with "git status" output.

* mm/commit-template-squelch-advice-messages:
commit: disable status hints when writing to COMMIT_EDITMSG
wt-status: turn advice_status_hints into a field of wt_status
commit: factor status configuration is a helper function
---

b4980c63acad8457fb3606b9bd8b74d5e7cba8dd
diff --cc builtin/commit.c
index 29d4225ff2,321462a435..6ab4605cf5
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@@ -696,10 -705,12 +705,16 @@@ static int prepare_to_commit(const cha
  	if (s->fp == NULL)
  		die_errno(_("could not open '%s'"), git_path(commit_editmsg));
  
 +	/* Ignore status.displayCommentPrefix: we do need comments in COMMIT_EDITMSG. */
 +	old_display_comment_prefix = s->display_comment_prefix;
 +	s->display_comment_prefix = 1;
 +
+ 	/*
+ 	 * Most hints are counter-productive when the commit has
+ 	 * already started.
+ 	 */
+ 	s->hints = 0;
+ 
  	if (clean_message_contents)
  		stripspace(&sb, 0);