]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/maint-commit-check-committer-early'
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Jul 2012 21:05:18 +0000 (14:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Jul 2012 21:05:18 +0000 (14:05 -0700)
"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

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)