Merge branch 'jn/do-not-drop-username-when-reading-from-etc-mailname'
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 Feb 2013 20:40:05 +0000 (12:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 Feb 2013 20:40:05 +0000 (12:40 -0800)
commita14daf8b9101225792341e4354699c5a2e30449a
tree49be522d86a83d3887925beb7d76459df7311d00
parent67d9c41c4a74619d81d9832efb25773126934852
parentdc342a25d1b48cb53448fe0e5dde578edce3122c
Merge branch 'jn/do-not-drop-username-when-reading-from-etc-mailname'

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.  This is to fix it.

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