From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 24 Jul 2012 21:05:18 +0000 (-0700)
Subject: Merge branch 'jk/maint-commit-check-committer-early'
X-Git-Tag: v1.7.12-rc1~22
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=18502e36061bb91131628032b5c46ea4fc8f18a3;p=git.git

Merge branch 'jk/maint-commit-check-committer-early'

"git commit --amend" let the user edit the log message and then died
when the human-readable committer name was given insufficiently by
getpwent(3).

* jk/maint-commit-check-committer-early:
  commit: check committer identity more strictly
---

18502e36061bb91131628032b5c46ea4fc8f18a3
diff --cc builtin/commit.c
index 95eeab1d5,f9088d325..20cef95d6
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@@ -724,8 -771,11 +724,8 @@@ static int prepare_to_commit(const cha
  
  	strbuf_release(&sb);
  
 -	/* This checks and barfs if author is badly specified */
 -	determine_author_info(author_ident);
 -
  	/* This checks if committer ident is explicitly given */
- 	strbuf_addstr(&committer_ident, git_committer_info(0));
+ 	strbuf_addstr(&committer_ident, git_committer_info(IDENT_STRICT));
  	if (use_editor && include_status) {
  		char *ai_tmp, *ci_tmp;
  		if (whence != FROM_COMMIT)