Skip to content

Commit

Permalink
Default GIT_COMMITTER_NAME to login name in recieve-pack.
Browse files Browse the repository at this point in the history
If GIT_COMMITTER_NAME is not available in receive-pack but reflogs
are enabled we would normally die out with an error message asking
the user to correct their environment settings.

Now that reflogs are enabled by default in (what we guessed to be)
non-bare Git repositories this may cause problems for some users
who don't have their full name in the gecos field and who don't
have access to the remote system to correct the problem.

So rather than die()'ing out in receive-pack when we try to log a
ref change and have no committer name we default to the username,
as obtained from the host's password database.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Shawn O. Pearce authored and Junio C Hamano committed Dec 17, 2006
1 parent 81a361b commit a7f196a
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 0 deletions.
1 change: 1 addition & 0 deletions cache.h
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,7 @@ void datestamp(char *buf, int bufsize);
unsigned long approxidate(const char *);

extern int setup_ident(void);
extern void ignore_missing_committer_name();
extern const char *git_author_info(int);
extern const char *git_committer_info(int);

Expand Down
15 changes: 15 additions & 0 deletions ident.c
Original file line number Diff line number Diff line change
Expand Up @@ -221,3 +221,18 @@ 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));
}
}
2 changes: 2 additions & 0 deletions receive-pack.c
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,8 @@ int main(int argc, char **argv)
die("'%s': unable to chdir or not a git archive", dir);

setup_ident();
/* don't die if gecos is empty */
ignore_missing_committer_name();
git_config(receive_pack_config);

write_head_info();
Expand Down

0 comments on commit a7f196a

Please sign in to comment.