mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'jk/commit-date-approxidate'
Recent update to "git commit" broke amending an existing commit with bogus author/committer lines without a valid e-mail address. * jk/commit-date-approxidate: commit: always populate GIT_AUTHOR_* variables commit: loosen ident checks when generating template
This commit is contained in:
commit
2df39733e5
|
@ -522,6 +522,12 @@ static int is_a_merge(const struct commit *current_head)
|
|||
return !!(current_head->parents && current_head->parents->next);
|
||||
}
|
||||
|
||||
static void assert_split_ident(struct ident_split *id, const struct strbuf *buf)
|
||||
{
|
||||
if (split_ident_line(id, buf->buf, buf->len) || !id->date_begin)
|
||||
die("BUG: unable to parse our own ident: %s", buf->buf);
|
||||
}
|
||||
|
||||
static void export_one(const char *var, const char *s, const char *e, int hack)
|
||||
{
|
||||
struct strbuf buf = STRBUF_INIT;
|
||||
|
@ -532,20 +538,6 @@ static void export_one(const char *var, const char *s, const char *e, int hack)
|
|||
strbuf_release(&buf);
|
||||
}
|
||||
|
||||
static int sane_ident_split(struct ident_split *person)
|
||||
{
|
||||
if (!person->name_begin || !person->name_end ||
|
||||
person->name_begin == person->name_end)
|
||||
return 0; /* no human readable name */
|
||||
if (!person->mail_begin || !person->mail_end ||
|
||||
person->mail_begin == person->mail_end)
|
||||
return 0; /* no usable mail */
|
||||
if (!person->date_begin || !person->date_end ||
|
||||
!person->tz_begin || !person->tz_end)
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int parse_force_date(const char *in, struct strbuf *out)
|
||||
{
|
||||
strbuf_addch(out, '@');
|
||||
|
@ -623,25 +615,15 @@ static void determine_author_info(struct strbuf *author_ident)
|
|||
}
|
||||
|
||||
strbuf_addstr(author_ident, fmt_ident(name, email, date, IDENT_STRICT));
|
||||
if (!split_ident_line(&author, author_ident->buf, author_ident->len) &&
|
||||
sane_ident_split(&author)) {
|
||||
export_one("GIT_AUTHOR_NAME", author.name_begin, author.name_end, 0);
|
||||
export_one("GIT_AUTHOR_EMAIL", author.mail_begin, author.mail_end, 0);
|
||||
export_one("GIT_AUTHOR_DATE", author.date_begin, author.tz_end, '@');
|
||||
}
|
||||
|
||||
assert_split_ident(&author, author_ident);
|
||||
export_one("GIT_AUTHOR_NAME", author.name_begin, author.name_end, 0);
|
||||
export_one("GIT_AUTHOR_EMAIL", author.mail_begin, author.mail_end, 0);
|
||||
export_one("GIT_AUTHOR_DATE", author.date_begin, author.tz_end, '@');
|
||||
free(name);
|
||||
free(email);
|
||||
free(date);
|
||||
}
|
||||
|
||||
static void split_ident_or_die(struct ident_split *id, const struct strbuf *buf)
|
||||
{
|
||||
if (split_ident_line(id, buf->buf, buf->len) ||
|
||||
!sane_ident_split(id))
|
||||
die(_("Malformed ident string: '%s'"), buf->buf);
|
||||
}
|
||||
|
||||
static int author_date_is_interesting(void)
|
||||
{
|
||||
return author_message || force_date;
|
||||
|
@ -856,8 +838,14 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
|
|||
status_printf_ln(s, GIT_COLOR_NORMAL,
|
||||
"%s", only_include_assumed);
|
||||
|
||||
split_ident_or_die(&ai, author_ident);
|
||||
split_ident_or_die(&ci, &committer_ident);
|
||||
/*
|
||||
* These should never fail because they come from our own
|
||||
* fmt_ident. They may fail the sane_ident test, but we know
|
||||
* that the name and mail pointers will at least be valid,
|
||||
* which is enough for our tests and printing here.
|
||||
*/
|
||||
assert_split_ident(&ai, author_ident);
|
||||
assert_split_ident(&ci, &committer_ident);
|
||||
|
||||
if (ident_cmp(&ai, &ci))
|
||||
status_printf_ln(s, GIT_COLOR_NORMAL,
|
||||
|
|
Loading…
Reference in a new issue