From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 24 Aug 2012 19:05:08 +0000 (-0700)
Subject: Merge branch 'jk/maint-commit-check-committer-early' into maint-1.7.11
X-Git-Tag: v1.7.11.6~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9e0833c30e1afef7dcffe2c151d0545ecdc730bf;p=thirdparty%2Fgit.git

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

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

9e0833c30e1afef7dcffe2c151d0545ecdc730bf
diff --cc builtin/commit.c
index 95eeab1d51,f9088d325f..20cef95d60
--- 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)