@matheusbsbs / matheus-bagliano / commits / d9ccfe7711
Fork 0

Fix --signoff in builtin-commit differently.

Introduce fmt_name() specifically meant for formatting the name and email pair, to add signed-off-by value. This reverts parts of 13208572fbe8838fd8835548d7502202d1f7b21d (builtin-commit: fix --signoff) so that an empty datestamp string given to fmt_ident() by mistake will error out as before. Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Dec 2, 2007 at 13:43 UTC d9ccfe7711a8bf1ed9d9cd87daa9863e0d564b23
3 files changed +27 -14
builtin-commit.c
+2 -4
@@ -346,11 +346,9 @@ static int prepare_log_message(const char *index_file, const char *prefix)
346
347 strbuf_init(&sob, 0);
348 strbuf_addstr(&sob, sign_off_header);
349 - strbuf_addstr(&sob, fmt_ident(getenv("GIT_COMMITTER_NAME"),
350 - getenv("GIT_COMMITTER_EMAIL"),
351 - "", 1));
349 + strbuf_addstr(&sob, fmt_name(getenv("GIT_COMMITTER_NAME"),
350 + getenv("GIT_COMMITTER_EMAIL")));
351 strbuf_addch(&sob, '\n');
353 -
352 for (i = sb.len - 1; i > 0 && sb.buf[i - 1] != '\n'; i--)
353 ; /* do nothing */
354 if (prefixcmp(sb.buf + i, sob.buf)) {
cache.h
+1
@@ -444,6 +444,7 @@ enum date_mode parse_date_format(const char *format);
444 extern const char *git_author_info(int);
445 extern const char *git_committer_info(int);
446 extern const char *fmt_ident(const char *name, const char *email, const char *date_str, int);
447 +extern const char *fmt_name(const char *name, const char *email);
448
449 struct checkout {
450 const char *base_dir;
ident.c
+24 -10
@@ -192,12 +192,14 @@ static const char *env_hint =
192 "Omit --global to set the identity only in this repository.\n"
193 "\n";
194
195 -const char *fmt_ident(const char *name, const char *email,
196 - const char *date_str, int error_on_no_name)
195 +static const char *fmt_ident_1(const char *name, const char *email,
196 + const char *date_str, int flag)
197 {
198 static char buffer[1000];
199 char date[50];
200 int i;
201 + int error_on_no_name = !!(flag & 01);
202 + int name_addr_only = !!(flag & 02);
203
204 setup_ident();
205 if (!name)
@@ -224,24 +226,36 @@ const char *fmt_ident(const char *name, const char *email,
226 }
227
228 strcpy(date, git_default_date);
227 - if (date_str) {
228 - if (*date_str)
229 - parse_date(date_str, date, sizeof(date));
230 - else
231 - date[0] = '\0';
232 - }
229 + if (!name_addr_only && date_str)
230 + parse_date(date_str, date, sizeof(date));
231
232 i = copy(buffer, sizeof(buffer), 0, name);
233 i = add_raw(buffer, sizeof(buffer), i, " <");
234 i = copy(buffer, sizeof(buffer), i, email);
237 - i = add_raw(buffer, sizeof(buffer), i, date[0] ? "> " : ">");
238 - i = copy(buffer, sizeof(buffer), i, date);
235 + if (!name_addr_only) {
236 + i = add_raw(buffer, sizeof(buffer), i, "> ");
237 + i = copy(buffer, sizeof(buffer), i, date);
238 + } else {
239 + i = add_raw(buffer, sizeof(buffer), i, ">");
240 + }
241 if (i >= sizeof(buffer))
242 die("Impossibly long personal identifier");
243 buffer[i] = 0;
244 return buffer;
245 }
246
247 +const char *fmt_ident(const char *name, const char *email,
248 + const char *date_str, int error_on_no_name)
249 +{
250 + int flag = (error_on_no_name ? 01 : 0);
251 + return fmt_ident_1(name, email, date_str, flag);
252 +}
253 +
254 +const char *fmt_name(const char *name, const char *email)
255 +{
256 + return fmt_ident_1(name, email, NULL, 03);
257 +}
258 +
259 const char *git_author_info(int error_on_no_name)
260 {
261 return fmt_ident(getenv("GIT_AUTHOR_NAME"),