Skip to content
  • Jonathan Nieder's avatar
    ident: check /etc/mailname if email is unknown · 8a55caa8
    Jonathan Nieder authored and Junio C Hamano's avatar Junio C Hamano committed
    
    
    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 maybe it could be
    useful sometimes on other machines, too.  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 using a resolver that was slow to handle reverse DNS
       lookups.
    
    Alas, after this patch, 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.  But
    I think it's worth it.
    
    Mechanics: the functionality of reading mailname goes in its own
    function, so people who care about other distros can easily add an
    implementation to a similar location without making copy_email() too
    long and losing clarity.  While at it, we split out the fallback
    default logic that does gethostname(), too (rearranging it a little
    and adding a check for errors from gethostname while at it).
    
    Based on a patch by Gerrit Pape <pape@smarden.org>.
    
    Requested-by: default avatarIan Jackson <ijackson@chiark.greenend.org.uk>
    Signed-off-by: default avatarJonathan Nieder <jrnieder@gmail.com>
    Improved-by: default avatarJunio C Hamano <gitster@pobox.com>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    8a55caa8