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: https://git.lorimer.id.au/gitweb.git/diff_plain/9e0833c30e1afef7dcffe2c151d0545ecdc730bf?hp=df1effa6909d07c859e4ade03dbea3e32e5595b4

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

diff --git a/builtin/commit.c b/builtin/commit.c
index 95eeab1d51..20cef95d60 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -725,7 +725,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
 	strbuf_release(&sb);
 
 	/* 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)