projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Optionally support old diffs
[git.git]
/
ident.c
diff --git
a/ident.c
b/ident.c
index
bc89e1d
..
23b8cfc
100644
(file)
--- 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
/*
* Copy the rest to the buffer, but avoid the special
- * characters '\n' '<' and '>' that act as delim
e
ters on
+ * characters '\n' '<' and '>' that act as delim
i
ters on
* a identification line
*/
for (i = 0; i < len; i++) {
* 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;
}
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];
@@
-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;
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));
@@
-181,12
+187,16
@@
char *get_ident(const char *name, const char *email, const char *date_str)
return buffer;
}
return buffer;
}
-char *git_author_info(void)
+c
onst c
har *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)
+c
onst c
har *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"));
}
}