summaryrefslogtreecommitdiff
path: root/ident.c
diff options
context:
space:
mode:
authorPierre Habouzit <madcoder@debian.org>2007-06-05 16:40:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-06-06 07:31:40 (GMT)
commitec563e8153cba89728a271a26c8a94e7a42d8152 (patch)
tree5235da3ab429bb0014e7bc36bbd1c425f2c78793 /ident.c
parentd0f51a8b2ae25ad9a676d0214616241685e8f1d0 (diff)
downloadgit-ec563e8153cba89728a271a26c8a94e7a42d8152.zip
git-ec563e8153cba89728a271a26c8a94e7a42d8152.tar.gz
git-ec563e8153cba89728a271a26c8a94e7a42d8152.tar.bz2
$EMAIL is a last resort fallback, as it's system-wide.
$EMAIL is a system-wide setup that is used for many many many applications. If the git user chose a specific user.email setup, then _this_ should be honoured rather than $EMAIL. Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ident.c')
-rw-r--r--ident.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ident.c b/ident.c
index 69a04b8..3d49608 100644
--- a/ident.c
+++ b/ident.c
@@ -196,9 +196,9 @@ const char *fmt_ident(const char *name, const char *email,
if (!name)
name = git_default_name;
if (!email)
- email = getenv("EMAIL");
- if (!email)
email = git_default_email;
+ if (!email)
+ email = getenv("EMAIL");
if (!*name) {
struct passwd *pw;