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

diff --cc builtin/commit.c
index 29d4225ff214d629eab622242ae8e0aac780ead1,321462a435d2fa2b22d4fb59decbe7e39d1f7084..6ab4605cf5c2e6ef5efb37518c9c215bf8895f97
--- 1/builtin/commit.c
--- 2/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);
  

diff --cc wt-status.c
Simple merge

diff --cc wt-status.h
Simple merge