$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.
[jc: cherry-picked ec563e8
from 'master']
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
fadf488f9b
commit
1367214417
4
ident.c
4
ident.c
@ -195,10 +195,10 @@ const char *fmt_ident(const char *name, const char *email,
|
|||||||
setup_ident();
|
setup_ident();
|
||||||
if (!name)
|
if (!name)
|
||||||
name = git_default_name;
|
name = git_default_name;
|
||||||
if (!email)
|
|
||||||
email = getenv("EMAIL");
|
|
||||||
if (!email)
|
if (!email)
|
||||||
email = git_default_email;
|
email = git_default_email;
|
||||||
|
if (!email)
|
||||||
|
email = getenv("EMAIL");
|
||||||
|
|
||||||
if (!*name) {
|
if (!*name) {
|
||||||
struct passwd *pw;
|
struct passwd *pw;
|
||||||
|
Loading…
Reference in New Issue
Block a user