From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 20 Jan 2010 22:40:12 +0000 (-0800)
Subject: Merge branch 'jk/warn-author-committer-after-commit'
X-Git-Tag: v1.7.0-rc0~72
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0877510ad4e8b951b08f9cbb25cfc0d994468979;p=git.git

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
---

0877510ad4e8b951b08f9cbb25cfc0d994468979
diff --cc builtin-commit.c
index 9b9dbaa5b,29dc3df78..42f11c30c
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@@ -36,7 -35,20 +36,20 @@@ static const char * const builtin_statu
  	NULL
  };
  
+ 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], merge_head_sha1[20];
 +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 */