$EMAIL is a last resort fallback, as it's system-wide.
authorJunio C Hamano <gitster@pobox.com>
Sat, 16 Jun 2007 06:33:06 +0000 (23:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 16 Jun 2007 06:33:06 +0000 (23:33 -0700)
$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.

[jc: cherry-picked ec563e8 from 'master']

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
ident.c

diff --git a/ident.c b/ident.c
index 69a04b8..3d49608 100644 (file)
--- a/ident.c
+++ b/ident.c
@@ -195,10 +195,10 @@ const char *fmt_ident(const char *name, const char *email,
        setup_ident();
        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;