Jonathan NiederFrom: Gerrit Pape <pape@smarden.org>
Before falling back to gethostname(), check /etc/mailname if GIT_AUTHOR_EMAIL is not set in the environment or through config files. Only fall back if /etc/mailname cannot be opened or read.
The /etc/mailname convention comes from Debian policy section 11.6 ("mail transport, delivery and user agents"), though it seems more widely useful. The lack of this support was noticed by various people in different ways:
- Ian observed that git was choosing the address 'ian@anarres.relativity.greenend.org.uk' rather than 'ian@davenant.greenend.org.uk' as it should have done.
- Jonathan noticed that operations like "git commit" were needlessly slow when the using a resolver that was slow to handle reverse DNS lookups.
On the other hand, this means that if /etc/mailname is set up and the [user] name and email configuration aren't, the committer email will not provide a charming reminder of which machine commits were made on any more. I think that cost is worth it.
Requested-by: Ian Jackson <ijackson@chiark.greenend.org.uk> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> --- Hi,
Debian has been using something like this patch for years now (see <http://bugs.debian.org/448655>) but I thought it might be useful to others, too. A similar patch visited the list three years ago: <http://thread.gmane.org/gmane.comp.version-control.git/51800>.
Thoughts of all kinds welcome, of course.
Thanks, Jonathan
Documentation/git-commit-tree.txt | 8 +++++++- ident.c | 23 +++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletions(-)
Show changes to 2 files +30 −1
Documentation/git-commit-tree.txt, ident.c
diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt index 0fdb82ee..02133d5f 100644 --- a/Documentation/git-commit-tree.txt +++ b/Documentation/git-commit-tree.txt @@ -68,7 +68,9 @@ if set: In case (some of) these environment variables are not set, the information is taken from the configuration items user.name and user.email, or, if not -present, system user name and fully qualified hostname. +present, system user name and the hostname used for outgoing mail (taken +from `/etc/mailname` and falling back to the fully qualified hostname when +that file does not exist). A commit comment is read from stdin. If a changelog entry is not provided via "<" redirection, 'git commit-tree' will just wait @@ -90,6 +92,10 @@ Discussion include::i18n.txt[] +FILES +----- +/etc/mailname + SEE ALSO -------- linkgit:git-write-tree[1] diff --git a/ident.c b/ident.c index 35a6f264..87f0a37e 100644 --- a/ident.c +++ b/ident.c @@ -52,6 +52,8 @@ static void copy_gecos(const struct passwd *w, char *name, size_t sz) static void copy_email(const struct passwd *pw) { + FILE *mailname; + /* * Make up a fake email address * (name + '@' + hostname [+ '.' + domainname]) @@ -61,6 +63,27 @@ static void copy_email(const struct passwd *pw) die("Your sysadmin must hate you!"); memcpy(git_default_email, pw->pw_name, len); git_default_email[len++] = '@'; + + /* + * The domain part comes from /etc/mailname if it is readable, + * or the current hostname and domain name otherwise. + */ + mailname = fopen("/etc/mailname", "r"); + if (!mailname) { + if (errno != ENOENT) + warning("cannot open /etc/mailname: %s", + strerror(errno)); + } else if (fgets(git_default_email + len, + sizeof(git_default_email) - len, mailname)) { + /* success! */ + fclose(mailname); + return; + } else { + if (ferror(mailname)) + warning("cannot read /etc/mailname: %s", + strerror(errno)); + fclose(mailname); + } gethostname(git_default_email + len, sizeof(git_default_email) - len); if (!strchr(git_default_email+len, '.')) { struct hostent *he = gethostbyname(git_default_email + len);
-- 1.7.7.rc1
