Merge branch 'jk/warn-author-committer-after-commit'

* jk/warn-author-committer-after-commit:
  user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere
  commit.c::print_summary: do not release the format string too early
  commit: allow suppression of implicit identity advice
  commit: show interesting ident information in summary
  strbuf: add strbuf_addbuf_percentquote
  strbuf_expand: convert "%%" to "%"

Conflicts:
	builtin-commit.c
	ident.c

diff --cc Documentation/config.txt
Simple merge

diff --cc builtin-commit.c
index 9b9dbaa5bf3a42c079d67902f1d8a125d0dacbba,29dc3df786831465e30dcbcec536de9e7367423b..42f11c30ca9e099cbed957107c25200efcc6ecd5
--- 1/builtin-commit.c
--- 2/builtin-commit.c
+++ b/builtin-commit.c
@@@ -36,7 -35,20 +36,20 @@@ static const char * const builtin_statu
        NULL
  };
  
 -static unsigned char head_sha1[20], merge_head_sha1[20];
+ static const char implicit_ident_advice[] =
+ "Your name and email address were configured automatically based\n"
+ "on your username and hostname. Please check that they are accurate.\n"
+ "You can suppress this message by setting them explicitly:\n"
+ "\n"
+ "    git config --global user.name Your Name\n"
+ "    git config --global user.email you@example.com\n"
+ "\n"
+ "If the identity used for this commit is wrong, you can fix it with:\n"
+ "\n"
+ "    git commit --amend --author='Your Name <you@example.com>'\n";
+ 
 +static unsigned char head_sha1[20];
+ 
  static char *use_message_buffer;
  static const char commit_editmsg[] = "COMMIT_EDITMSG";
  static struct lock_file index_lock; /* real index */

diff --cc daemon.c
Simple merge

diff --cc strbuf.c
Simple merge

diff --cc strbuf.h
Simple merge

diff --cc t/t7501-commit.sh
Simple merge