From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 4 Feb 2013 18:04:26 +0000 (-0800)
Subject: Merge branch 'jn/do-not-drop-username-when-reading-from-etc-mailname' into maint
X-Git-Tag: v1.8.1.3~11
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7f3d409cd18e74c1d3adf892dce70a2d02d0797a?ds=inline;hp=-c

Merge branch 'jn/do-not-drop-username-when-reading-from-etc-mailname' into maint

We used to stuff "user@" and then append what we read from
/etc/mailname to come up with a default e-mail ident, but a bug lost
the "user@" part.

* jn/do-not-drop-username-when-reading-from-etc-mailname:
ident: do not drop username when reading from /etc/mailname
---

7f3d409cd18e74c1d3adf892dce70a2d02d0797a
diff --combined ident.c
index ac9672f607,fb4cc722a3..1c123e685f
--- a/ident.c
+++ b/ident.c
@@@ -10,12 -10,7 +10,12 @@@
  static struct strbuf git_default_name = STRBUF_INIT;
  static struct strbuf git_default_email = STRBUF_INIT;
  static char git_default_date[50];
 -int user_ident_explicitly_given;
 +
 +#define IDENT_NAME_GIVEN 01
 +#define IDENT_MAIL_GIVEN 02
 +#define IDENT_ALL_GIVEN (IDENT_NAME_GIVEN|IDENT_MAIL_GIVEN)
 +static int committer_ident_explicitly_given;
 +static int author_ident_explicitly_given;
  
  #ifdef NO_GECOS_IN_PWENT
  #define get_gecos(ignored) "&"
@@@ -46,6 -41,7 +46,7 @@@ static void copy_gecos(const struct pas
  static int add_mailname_host(struct strbuf *buf)
  {
  	FILE *mailname;
+ 	struct strbuf mailnamebuf = STRBUF_INIT;
  
  	mailname = fopen("/etc/mailname", "r");
  	if (!mailname) {
@@@ -54,14 -50,17 +55,17 @@@
  				strerror(errno));
  		return -1;
  	}
- 	if (strbuf_getline(buf, mailname, '\n') == EOF) {
+ 	if (strbuf_getline(&mailnamebuf, mailname, '\n') == EOF) {
  		if (ferror(mailname))
  			warning("cannot read /etc/mailname: %s",
  				strerror(errno));
+ 		strbuf_release(&mailnamebuf);
  		fclose(mailname);
  		return -1;
  	}
  	/* success! */
+ 	strbuf_addbuf(buf, &mailnamebuf);
+ 	strbuf_release(&mailnamebuf);
  	fclose(mailname);
  	return 0;
  }
@@@ -98,7 -97,7 +102,7 @@@ static void copy_email(const struct pas
  	add_domainname(email);
  }
  
 -const char *ident_default_name(void)
 +static const char *ident_default_name(void)
  {
  	if (!git_default_name.len) {
  		copy_gecos(xgetpwuid_self(), &git_default_name);
@@@ -114,8 -113,7 +118,8 @@@ const char *ident_default_email(void
  
  		if (email && email[0]) {
  			strbuf_addstr(&git_default_email, email);
 -			user_ident_explicitly_given |= IDENT_MAIL_GIVEN;
 +			committer_ident_explicitly_given |= IDENT_MAIL_GIVEN;
 +			author_ident_explicitly_given |= IDENT_MAIL_GIVEN;
  		} else
  			copy_email(xgetpwuid_self(), &git_default_email);
  		strbuf_trim(&git_default_email);
@@@ -123,7 -121,7 +127,7 @@@
  	return git_default_email.buf;
  }
  
 -const char *ident_default_date(void)
 +static const char *ident_default_date(void)
  {
  	if (!git_default_date[0])
  		datestamp(git_default_date, sizeof(git_default_date));
@@@ -333,10 -331,6 +337,10 @@@ const char *fmt_name(const char *name, 
  
  const char *git_author_info(int flag)
  {
 +	if (getenv("GIT_AUTHOR_NAME"))
 +		author_ident_explicitly_given |= IDENT_NAME_GIVEN;
 +	if (getenv("GIT_AUTHOR_EMAIL"))
 +		author_ident_explicitly_given |= IDENT_MAIL_GIVEN;
  	return fmt_ident(getenv("GIT_AUTHOR_NAME"),
  			 getenv("GIT_AUTHOR_EMAIL"),
  			 getenv("GIT_AUTHOR_DATE"),
@@@ -346,16 -340,16 +350,16 @@@
  const char *git_committer_info(int flag)
  {
  	if (getenv("GIT_COMMITTER_NAME"))
 -		user_ident_explicitly_given |= IDENT_NAME_GIVEN;
 +		committer_ident_explicitly_given |= IDENT_NAME_GIVEN;
  	if (getenv("GIT_COMMITTER_EMAIL"))
 -		user_ident_explicitly_given |= IDENT_MAIL_GIVEN;
 +		committer_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)
 +static int ident_is_sufficient(int user_ident_explicitly_given)
  {
  #ifndef WINDOWS
  	return (user_ident_explicitly_given & IDENT_MAIL_GIVEN);
@@@ -364,16 -358,6 +368,16 @@@
  #endif
  }
  
 +int committer_ident_sufficiently_given(void)
 +{
 +	return ident_is_sufficient(committer_ident_explicitly_given);
 +}
 +
 +int author_ident_sufficiently_given(void)
 +{
 +	return ident_is_sufficient(author_ident_explicitly_given);
 +}
 +
  int git_ident_config(const char *var, const char *value, void *data)
  {
  	if (!strcmp(var, "user.name")) {
@@@ -381,8 -365,7 +385,8 @@@
  			return config_error_nonbool(var);
  		strbuf_reset(&git_default_name);
  		strbuf_addstr(&git_default_name, value);
 -		user_ident_explicitly_given |= IDENT_NAME_GIVEN;
 +		committer_ident_explicitly_given |= IDENT_NAME_GIVEN;
 +		author_ident_explicitly_given |= IDENT_NAME_GIVEN;
  		return 0;
  	}
  
@@@ -391,8 -374,7 +395,8 @@@
  			return config_error_nonbool(var);
  		strbuf_reset(&git_default_email);
  		strbuf_addstr(&git_default_email, value);
 -		user_ident_explicitly_given |= IDENT_MAIL_GIVEN;
 +		committer_ident_explicitly_given |= IDENT_MAIL_GIVEN;
 +		author_ident_explicitly_given |= IDENT_MAIL_GIVEN;
  		return 0;
  	}