diffcore-rename: favour identical basenames

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;