Merge branch 'jk/maint-commit-check-committer-early' into maint-1.7.11
authorJunio C Hamano <gitster@pobox.com>
Fri, 24 Aug 2012 19:05:08 +0000 (12:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 Aug 2012 19:05:08 +0000 (12:05 -0700)
* jk/maint-commit-check-committer-early:
commit: check committer identity more strictly

1  2 
builtin/commit.c
index 95eeab1d5146628277b0ba2c4e4bc7a6f77f3a4a,f9088d325f7ec225c870af438611375542b9e782..20cef95d600aeb15b716793beb5fb2534cc2b682
@@@ -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)