X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=ident.c;h=23b8cfc600dfa7910d6b9afdfed8bcdf8b033781;hb=7162dff3dde6fb0a2829fbc8e641fc6d1e7e76ec;hp=ac1c27f1998b8245132dced5875e022fe24b93ec;hpb=56fc63193975edd4b9f520b6c65c2b97ecd8ee38;p=git.git

diff --git a/ident.c b/ident.c
index ac1c27f1..23b8cfc6 100644
--- a/ident.c
+++ b/ident.c
@@ -140,7 +140,7 @@ static int copy(char *buf, int size, int offset, const char *src)
 
 	/*
 	 * Copy the rest to the buffer, but avoid the special
-	 * characters '\n' '<' and '>' that act as delimeters on
+	 * characters '\n' '<' and '>' that act as delimiters on
 	 * a identification line
 	 */
 	for (i = 0; i < len; i++) {
@@ -167,6 +167,11 @@ static const char *get_ident(const char *name, const char *email,
 		name = git_default_name;
 	if (!email)
 		email = git_default_email;
+
+	if (!*name || !*email)
+		die("empty ident %s <%s> not allowed",
+		    name, email);
+
 	strcpy(date, git_default_date);
 	if (date_str)
 		parse_date(date_str, date, sizeof(date));