$EMAIL is a last resort fallback, as it's system-wide.
authorPierre Habouzit <madcoder@debian.org>
Tue, 5 Jun 2007 16:40:41 +0000 (18:40 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Jun 2007 07:31:40 +0000 (00:31 -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.

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 69a04b827d7805d9b29153e31e5489edb587690a..3d49608e6f9afe22f24a2faf70f2d6cee50b8919 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;