diff options
| -rw-r--r-- | builtin-log.c | 2 | ||||
| -rw-r--r-- | cache.h | 1 | ||||
| -rw-r--r-- | ident.c | 28 | ||||
| -rw-r--r-- | receive-pack.c | 2 | ||||
| -rw-r--r-- | refs.c | 2 |
5 files changed, 13 insertions, 22 deletions
diff --git a/builtin-log.c b/builtin-log.c index 503cd1e2be..56acc137f0 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -352,7 +352,7 @@ static void get_patch_ids(struct rev_info *rev, struct diff_options *options, co static void gen_message_id(char *dest, unsigned int length, char *base) { - const char *committer = git_committer_info(1); + const char *committer = git_committer_info(-1); const char *email_start = strrchr(committer, '<'); const char *email_end = strrchr(committer, '>'); if(!email_start || !email_end || email_start > email_end - 1) @@ -320,7 +320,6 @@ void datestamp(char *buf, int bufsize); unsigned long approxidate(const char *); extern int setup_ident(void); -extern void ignore_missing_committer_name(void); extern const char *git_author_info(int); extern const char *git_committer_info(int); @@ -180,12 +180,21 @@ static const char *get_ident(const char *name, const char *email, email = git_default_email; if (!*name) { - if (name == git_default_name && env_hint) { + struct passwd *pw; + + if (0 <= error_on_no_name && + name == git_default_name && env_hint) { fprintf(stderr, env_hint, au_env, co_env); env_hint = NULL; /* warn only once, for "git-var -l" */ } - if (error_on_no_name) + if (0 < 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); @@ -218,18 +227,3 @@ const char *git_committer_info(int error_on_no_name) getenv("GIT_COMMITTER_DATE"), error_on_no_name); } - -void ignore_missing_committer_name() -{ - /* If we did not get a name from the user's gecos entry then - * git_default_name is empty; so instead load the username - * into it as a 'good enough for now' approximation of who - * this user is. - */ - if (!*git_default_name) { - struct passwd *pw = getpwuid(getuid()); - if (!pw) - die("You don't exist. Go away!"); - strlcpy(git_default_name, pw->pw_name, sizeof(git_default_name)); - } -} diff --git a/receive-pack.c b/receive-pack.c index 8b59b3227e..7d263262d3 100644 --- a/receive-pack.c +++ b/receive-pack.c @@ -430,8 +430,6 @@ int main(int argc, char **argv) die("attempt to push into a shallow repository"); setup_ident(); - /* don't die if gecos is empty */ - ignore_missing_committer_name(); git_config(receive_pack_config); if (0 <= transfer_unpack_limit) @@ -958,7 +958,7 @@ static int log_ref_write(struct ref_lock *lock, lock->log_file, strerror(errno)); } - committer = git_committer_info(1); + committer = git_committer_info(-1); if (msg) { maxlen = strlen(committer) + strlen(msg) + 2*40 + 5; logrec = xmalloc(maxlen); |