X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=ident.c;h=23b8cfc600dfa7910d6b9afdfed8bcdf8b033781;hb=5b5d4d9e1b31997b3179e6a253d47b7eea03d0fa;hp=bc89e1d04c63563c051005754a50247f22256974;hpb=8ac3a61f59173d4a9a328518be83a25df610a5ef;p=git.git

diff --git a/ident.c b/ident.c
index bc89e1d0..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++) {
@@ -156,7 +156,8 @@ static int copy(char *buf, int size, int offset, const char *src)
 	return offset;
 }
 
-char *get_ident(const char *name, const char *email, const char *date_str)
+static const char *get_ident(const char *name, const char *email,
+			     const char *date_str)
 {
 	static char buffer[1000];
 	char date[50];
@@ -166,6 +167,11 @@ char *get_ident(const char *name, const char *email, const char *date_str)
 		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));
@@ -181,12 +187,16 @@ char *get_ident(const char *name, const char *email, const char *date_str)
 	return buffer;
 }
 
-char *git_author_info(void)
+const char *git_author_info(void)
 {
-	return get_ident(getenv("GIT_AUTHOR_NAME"), getenv("GIT_AUTHOR_EMAIL"), getenv("GIT_AUTHOR_DATE"));
+	return get_ident(getenv("GIT_AUTHOR_NAME"),
+			 getenv("GIT_AUTHOR_EMAIL"),
+			 getenv("GIT_AUTHOR_DATE"));
 }
 
-char *git_committer_info(void)
+const char *git_committer_info(void)
 {
-	return get_ident(getenv("GIT_COMMITTER_NAME"), getenv("GIT_COMMITTER_EMAIL"), getenv("GIT_COMMITTER_DATE"));
+	return get_ident(getenv("GIT_COMMITTER_NAME"),
+			 getenv("GIT_COMMITTER_EMAIL"),
+			 getenv("GIT_COMMITTER_DATE"));
 }