summaryrefslogtreecommitdiff
path: root/config.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 /config.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 'config.c')
-rw-r--r--config.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/config.c b/config.c
index e42ada78f8..5195de10c9 100644
--- a/config.c
+++ b/config.c
@@ -448,6 +448,8 @@ int git_default_config(const char *var, const char *value)
if (!value)
return config_error_nonbool(var);
strlcpy(git_default_name, value, sizeof(git_default_name));
+ if (git_default_email[0])
+ user_ident_explicitly_given = 1;
return 0;
}
@@ -455,6 +457,8 @@ int git_default_config(const char *var, const char *value)
if (!value)
return config_error_nonbool(var);
strlcpy(git_default_email, value, sizeof(git_default_email));
+ if (git_default_name[0])
+ user_ident_explicitly_given = 1;
return 0;
}