summaryrefslogtreecommitdiff
path: root/ident.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-05-14 13:45:20 -0700
committerJunio C Hamano <gitster@pobox.com>2008-05-14 13:45:20 -0700
commitb66ae7955ca10cf4f59130c9a63b327e4d9df104 (patch)
tree89b6d915cf08c4cccfdb1485c6da3482094f5d4b /ident.c
parent761adeb4dba3305d0810b5340a71783d29484fb0 (diff)
parentbb1ae3f6fff19b0a1ab1bb6a815d26d39b9f15e6 (diff)
downloadgit-b66ae7955ca10cf4f59130c9a63b327e4d9df104.tar.gz
Merge branch 'sb/committer'
* sb/committer: commit: Show committer if automatic commit: Show author if different from committer Preparation to call determine_author_info from prepare_to_commit
Diffstat (limited to 'ident.c')
-rw-r--r--ident.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/ident.c b/ident.c
index ed44a5345a..b35504a8d2 100644
--- a/ident.c
+++ b/ident.c
@@ -250,6 +250,9 @@ const char *git_author_info(int flag)
const char *git_committer_info(int flag)
{
+ if (getenv("GIT_COMMITTER_NAME") &&
+ getenv("GIT_COMMITTER_EMAIL"))
+ user_ident_explicitly_given = 1;
return fmt_ident(getenv("GIT_COMMITTER_NAME"),
getenv("GIT_COMMITTER_EMAIL"),
getenv("GIT_COMMITTER_DATE"),