[PATCHv2 14/15] ident: trim whitespace from default name/email
- From
Jeff King <peff@peff.net>
- Date
- May 21, 2012, 23:10 UTC
- Message-ID
- <20120521231029.GN10981@sigill.intra.peff.net>
- In-Reply-To
- <20120521230917.GA474@sigill.intra.peff.net>
Usually these values get fed to fmt_ident, which will trim any cruft anyway, but there are a few code paths which use them directly. Let's clean them up for the benefit of those callers. Furthermore, fmt_ident will look at the pre-trimmed value and decide whether to invoke ERROR_ON_NO_NAME; this check can be fooled by a name consisting only of spaces.
Note that we only bother to clean up when we are pulling the information from gecos or from system files. Any other value comes from a config file, where we will have cleaned up accidental whitespace already.
Signed-off-by: Jeff King <peff@peff.net> --- ident.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/ident.c b/ident.c index cefb829..e279039 100644 --- a/ident.c +++ b/ident.c @@ -95,8 +95,10 @@ static void copy_email(const struct passwd *pw, struct strbuf *email) const char *ident_default_name(void) { - if (!git_default_name.len) + if (!git_default_name.len) { copy_gecos(xgetpwuid_self(), &git_default_name); + strbuf_trim(&git_default_name); + } return git_default_name.buf; } @@ -110,6 +112,7 @@ const char *ident_default_email(void) user_ident_explicitly_given |= IDENT_MAIL_GIVEN; } else copy_email(xgetpwuid_self(), &git_default_email); + strbuf_trim(&git_default_email); } return git_default_email.buf; }
-- 1.7.10.1.19.g711d603