@matheusbsbs / matheus-bagliano / commits / c15e1987ae

ident: let callers omit name with fmt_indent

Most callers want to see all of "$name <$email> $date", but a few want only limited parts, omitting the date, or even the name. We already have IDENT_NO_DATE to handle the date part, but there's not a good option for getting just the email. Callers have to done one of: 1. Call ident_default_email; this does not respect environment variables, nor does it promise to trim whitespace or other crud from the result. 2. Call git_{committer,author}_info; this returns the name and email, leaving the caller to parse out the wanted bits. This patch adds IDENT_NO_NAME; it stops short of adding IDENT_NO_EMAIL, as no callers want it (nor are likely to), and it complicates the error handling of the function. When no name is requested, the angle brackets (<>) around the email address are also omitted. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed May 24, 2012 at 19:27 UTC c15e1987aec562107bd8e4a9fdeebf6d27d0e53a

2 files changed +10 -5

cache.h

@@ -889,6 +889,7 @@ enum date_mode parse_date_format(const char *format);

889

890 #define IDENT_ERROR_ON_NO_NAME 1

891 #define IDENT_NO_DATE 2

892 +#define IDENT_NO_NAME 4

893 extern const char *git_author_info(int);

894 extern const char *git_committer_info(int);

895 extern const char *fmt_ident(const char *name, const char *email, const char *date_str, int);

ident.c

+9 -5

@@ -269,13 +269,14 @@ const char *fmt_ident(const char *name, const char *email,

269 char date[50];

270 int error_on_no_name = (flag & IDENT_ERROR_ON_NO_NAME);

271 int want_date = !(flag & IDENT_NO_DATE);

272 + int want_name = !(flag & IDENT_NO_NAME);

273

273 - if (!name)

274 + if (want_name && !name)

275 name = ident_default_name();

276 if (!email)

277 email = ident_default_email();

278

278 - if (!*name) {

279 + if (want_name && !*name) {

280 struct passwd *pw;

281

282 if (error_on_no_name) {

@@ -297,10 +298,13 @@ const char *fmt_ident(const char *name, const char *email,

298 }

299

300 strbuf_reset(&ident);

300 - strbuf_addstr_without_crud(&ident, name);

301 - strbuf_addstr(&ident, " <");

301 + if (want_name) {

302 + strbuf_addstr_without_crud(&ident, name);

303 + strbuf_addstr(&ident, " <");

304 + }

305 strbuf_addstr_without_crud(&ident, email);

303 - strbuf_addch(&ident, '>');

306 + if (want_name)

307 + strbuf_addch(&ident, '>');

308 if (want_date) {

309 strbuf_addch(&ident, ' ');

310 strbuf_addstr_without_crud(&ident, date);