X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=ident.c;h=6612d17eba1b2bac59689d4fd5e742df242662fc;hb=b8de7f764e1a9f6e8dfb587a6145906394fa607d;hp=69a04b827d7805d9b29153e31e5489edb587690a;hpb=5f5dbd719d0d8ec136f32a0a56674902bd85f72f;p=git.git

diff --git a/ident.c b/ident.c
index 69a04b827..6612d17eb 100644
--- a/ident.c
+++ b/ident.c
@@ -83,11 +83,18 @@ static void setup_ident(void)
 	}
 
 	if (!git_default_email[0]) {
-		if (!pw)
-			pw = getpwuid(getuid());
-		if (!pw)
-			die("You don't exist. Go away!");
-		copy_email(pw);
+		const char *email = getenv("EMAIL");
+
+		if (email && email[0])
+			strlcpy(git_default_email, email,
+				sizeof(git_default_email));
+		else {
+			if (!pw)
+				pw = getpwuid(getuid());
+			if (!pw)
+				die("You don't exist. Go away!");
+			copy_email(pw);
+		}
 	}
 
 	/* And set the default date */
@@ -195,8 +202,6 @@ 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;