Merge branch 'jn/do-not-drop-username-when-reading-from-etc-mailname' into maint
commit7f3d409cd18e74c1d3adf892dce70a2d02d0797a
authorJunio C Hamano <gitster@pobox.com>
Mon, 4 Feb 2013 18:04:26 +0000 (4 10:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 4 Feb 2013 18:04:26 +0000 (4 10:04 -0800)
tree6c957c196edad902d72e28861f4b2be9d6616b7a
parent3d00a5c148ee5611fc21de6d20f5f82602a75c5f
parentdc342a25d1b48cb53448fe0e5dde578edce3122c
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
ident.c