Merge branch 'maint'

diff --git a/ident.c b/ident.c
index 88e7f74e888f1c7b13182bf07afee01408e8e525..69a04b827d7805d9b29153e31e5489edb587690a 100644 (file)
--- a/ident.c
+++ b/ident.c
@@ -195,6 +195,8 @@ 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;