mirror of
https://github.com/git/git.git
synced 2024-10-30 22:07:53 +01:00
4579bb418c
If the user gives "git commit --date=foobar", we silently ignore the --date flag. We should note the error. This patch puts the fix at the lowest level of fmt_ident, which means it also handles GIT_AUTHOR_DATE=foobar, as well. There are two down-sides to this approach: 1. Technically this breaks somebody doing something like "git commit --date=now", which happened to work because bogus data is the same as "now". Though we do explicitly handle the empty string, so anybody passing an empty variable through the environment will still work. If the error is too much, perhaps it can be downgraded to a warning? 2. The error checking happens _after_ the commit message is written, which can be annoying to the user. We can put explicit checks closer to the beginning of git-commit, but that feels a little hack-ish; suddenly git-commit has to care about how fmt_ident works. Maybe we could simply call fmt_ident earlier? Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
272 lines
6.1 KiB
C
272 lines
6.1 KiB
C
/*
|
|
* ident.c
|
|
*
|
|
* create git identifier lines of the form "name <email> date"
|
|
*
|
|
* Copyright (C) 2005 Linus Torvalds
|
|
*/
|
|
#include "cache.h"
|
|
|
|
static char git_default_date[50];
|
|
|
|
static void copy_gecos(const struct passwd *w, char *name, size_t sz)
|
|
{
|
|
char *src, *dst;
|
|
size_t len, nlen;
|
|
|
|
nlen = strlen(w->pw_name);
|
|
|
|
/* Traditionally GECOS field had office phone numbers etc, separated
|
|
* with commas. Also & stands for capitalized form of the login name.
|
|
*/
|
|
|
|
for (len = 0, dst = name, src = w->pw_gecos; len < sz; src++) {
|
|
int ch = *src;
|
|
if (ch != '&') {
|
|
*dst++ = ch;
|
|
if (ch == 0 || ch == ',')
|
|
break;
|
|
len++;
|
|
continue;
|
|
}
|
|
if (len + nlen < sz) {
|
|
/* Sorry, Mr. McDonald... */
|
|
*dst++ = toupper(*w->pw_name);
|
|
memcpy(dst, w->pw_name + 1, nlen - 1);
|
|
dst += nlen - 1;
|
|
}
|
|
}
|
|
if (len < sz)
|
|
name[len] = 0;
|
|
else
|
|
die("Your parents must have hated you!");
|
|
|
|
}
|
|
|
|
static void copy_email(const struct passwd *pw)
|
|
{
|
|
/*
|
|
* Make up a fake email address
|
|
* (name + '@' + hostname [+ '.' + domainname])
|
|
*/
|
|
size_t len = strlen(pw->pw_name);
|
|
if (len > sizeof(git_default_email)/2)
|
|
die("Your sysadmin must hate you!");
|
|
memcpy(git_default_email, pw->pw_name, len);
|
|
git_default_email[len++] = '@';
|
|
gethostname(git_default_email + len, sizeof(git_default_email) - len);
|
|
if (!strchr(git_default_email+len, '.')) {
|
|
struct hostent *he = gethostbyname(git_default_email + len);
|
|
char *domainname;
|
|
|
|
len = strlen(git_default_email);
|
|
git_default_email[len++] = '.';
|
|
if (he && (domainname = strchr(he->h_name, '.')))
|
|
strlcpy(git_default_email + len, domainname + 1,
|
|
sizeof(git_default_email) - len);
|
|
else
|
|
strlcpy(git_default_email + len, "(none)",
|
|
sizeof(git_default_email) - len);
|
|
}
|
|
}
|
|
|
|
static void setup_ident(void)
|
|
{
|
|
struct passwd *pw = NULL;
|
|
|
|
/* Get the name ("gecos") */
|
|
if (!git_default_name[0]) {
|
|
pw = getpwuid(getuid());
|
|
if (!pw)
|
|
die("You don't exist. Go away!");
|
|
copy_gecos(pw, git_default_name, sizeof(git_default_name));
|
|
}
|
|
|
|
if (!git_default_email[0]) {
|
|
const char *email = getenv("EMAIL");
|
|
|
|
if (email && email[0]) {
|
|
strlcpy(git_default_email, email,
|
|
sizeof(git_default_email));
|
|
user_ident_explicitly_given |= IDENT_MAIL_GIVEN;
|
|
} else {
|
|
if (!pw)
|
|
pw = getpwuid(getuid());
|
|
if (!pw)
|
|
die("You don't exist. Go away!");
|
|
copy_email(pw);
|
|
}
|
|
}
|
|
|
|
/* And set the default date */
|
|
if (!git_default_date[0])
|
|
datestamp(git_default_date, sizeof(git_default_date));
|
|
}
|
|
|
|
static int add_raw(char *buf, size_t size, int offset, const char *str)
|
|
{
|
|
size_t len = strlen(str);
|
|
if (offset + len > size)
|
|
return size;
|
|
memcpy(buf + offset, str, len);
|
|
return offset + len;
|
|
}
|
|
|
|
static int crud(unsigned char c)
|
|
{
|
|
return c <= 32 ||
|
|
c == '.' ||
|
|
c == ',' ||
|
|
c == ':' ||
|
|
c == ';' ||
|
|
c == '<' ||
|
|
c == '>' ||
|
|
c == '"' ||
|
|
c == '\\' ||
|
|
c == '\'';
|
|
}
|
|
|
|
/*
|
|
* Copy over a string to the destination, but avoid special
|
|
* characters ('\n', '<' and '>') and remove crud at the end
|
|
*/
|
|
static int copy(char *buf, size_t size, int offset, const char *src)
|
|
{
|
|
size_t i, len;
|
|
unsigned char c;
|
|
|
|
/* Remove crud from the beginning.. */
|
|
while ((c = *src) != 0) {
|
|
if (!crud(c))
|
|
break;
|
|
src++;
|
|
}
|
|
|
|
/* Remove crud from the end.. */
|
|
len = strlen(src);
|
|
while (len > 0) {
|
|
c = src[len-1];
|
|
if (!crud(c))
|
|
break;
|
|
--len;
|
|
}
|
|
|
|
/*
|
|
* Copy the rest to the buffer, but avoid the special
|
|
* characters '\n' '<' and '>' that act as delimiters on
|
|
* an identification line
|
|
*/
|
|
for (i = 0; i < len; i++) {
|
|
c = *src++;
|
|
switch (c) {
|
|
case '\n': case '<': case '>':
|
|
continue;
|
|
}
|
|
if (offset >= size)
|
|
return size;
|
|
buf[offset++] = c;
|
|
}
|
|
return offset;
|
|
}
|
|
|
|
static const char *env_hint =
|
|
"\n"
|
|
"*** Please tell me who you are.\n"
|
|
"\n"
|
|
"Run\n"
|
|
"\n"
|
|
" git config --global user.email \"you@example.com\"\n"
|
|
" git config --global user.name \"Your Name\"\n"
|
|
"\n"
|
|
"to set your account\'s default identity.\n"
|
|
"Omit --global to set the identity only in this repository.\n"
|
|
"\n";
|
|
|
|
const char *fmt_ident(const char *name, const char *email,
|
|
const char *date_str, int flag)
|
|
{
|
|
static char buffer[1000];
|
|
char date[50];
|
|
int i;
|
|
int error_on_no_name = (flag & IDENT_ERROR_ON_NO_NAME);
|
|
int warn_on_no_name = (flag & IDENT_WARN_ON_NO_NAME);
|
|
int name_addr_only = (flag & IDENT_NO_DATE);
|
|
|
|
setup_ident();
|
|
if (!name)
|
|
name = git_default_name;
|
|
if (!email)
|
|
email = git_default_email;
|
|
|
|
if (!*name) {
|
|
struct passwd *pw;
|
|
|
|
if ((warn_on_no_name || error_on_no_name) &&
|
|
name == git_default_name && env_hint) {
|
|
fputs(env_hint, stderr);
|
|
env_hint = NULL; /* warn only once */
|
|
}
|
|
if (error_on_no_name)
|
|
die("empty ident %s <%s> not allowed", name, email);
|
|
pw = getpwuid(getuid());
|
|
if (!pw)
|
|
die("You don't exist. Go away!");
|
|
strlcpy(git_default_name, pw->pw_name,
|
|
sizeof(git_default_name));
|
|
name = git_default_name;
|
|
}
|
|
|
|
strcpy(date, git_default_date);
|
|
if (!name_addr_only && date_str && date_str[0]) {
|
|
if (parse_date(date_str, date, sizeof(date)) < 0)
|
|
die("invalid date format: %s", date_str);
|
|
}
|
|
|
|
i = copy(buffer, sizeof(buffer), 0, name);
|
|
i = add_raw(buffer, sizeof(buffer), i, " <");
|
|
i = copy(buffer, sizeof(buffer), i, email);
|
|
if (!name_addr_only) {
|
|
i = add_raw(buffer, sizeof(buffer), i, "> ");
|
|
i = copy(buffer, sizeof(buffer), i, date);
|
|
} else {
|
|
i = add_raw(buffer, sizeof(buffer), i, ">");
|
|
}
|
|
if (i >= sizeof(buffer))
|
|
die("Impossibly long personal identifier");
|
|
buffer[i] = 0;
|
|
return buffer;
|
|
}
|
|
|
|
const char *fmt_name(const char *name, const char *email)
|
|
{
|
|
return fmt_ident(name, email, NULL, IDENT_ERROR_ON_NO_NAME | IDENT_NO_DATE);
|
|
}
|
|
|
|
const char *git_author_info(int flag)
|
|
{
|
|
return fmt_ident(getenv("GIT_AUTHOR_NAME"),
|
|
getenv("GIT_AUTHOR_EMAIL"),
|
|
getenv("GIT_AUTHOR_DATE"),
|
|
flag);
|
|
}
|
|
|
|
const char *git_committer_info(int flag)
|
|
{
|
|
if (getenv("GIT_COMMITTER_NAME"))
|
|
user_ident_explicitly_given |= IDENT_NAME_GIVEN;
|
|
if (getenv("GIT_COMMITTER_EMAIL"))
|
|
user_ident_explicitly_given |= IDENT_MAIL_GIVEN;
|
|
return fmt_ident(getenv("GIT_COMMITTER_NAME"),
|
|
getenv("GIT_COMMITTER_EMAIL"),
|
|
getenv("GIT_COMMITTER_DATE"),
|
|
flag);
|
|
}
|
|
|
|
int user_ident_sufficiently_given(void)
|
|
{
|
|
#ifndef WINDOWS
|
|
return (user_ident_explicitly_given & IDENT_MAIL_GIVEN);
|
|
#else
|
|
return (user_ident_explicitly_given == IDENT_ALL_GIVEN);
|
|
#endif
|
|
}
|