index bc89e1d04c63563c051005754a50247f22256974..23b8cfc600dfa7910d6b9afdfed8bcdf8b033781 100644 (file)
--- a/ident.c
+++ b/ident.c
/*
* Copy the rest to the buffer, but avoid the special
/*
* 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++) {
* a identification line
*/
for (i = 0; i < len; i++) {
return offset;
}
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];
{
static char buffer[1000];
char date[50];
name = git_default_name;
if (!email)
email = git_default_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));
strcpy(date, git_default_date);
if (date_str)
parse_date(date_str, date, sizeof(date));
return buffer;
}
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"));
}
}