diff --git a/builtin/am.c b/builtin/am.c index 0d97f2fabb0..00e4a098144 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -1839,6 +1839,8 @@ static void am_run(struct am_state *state, int resume) const char *mail = am_path(state, msgnum(state)); int apply_status; + reset_ident_date(); + if (!file_exists(mail)) goto next; diff --git a/cache.h b/cache.h index 7265439584f..c141b3ca0d9 100644 --- a/cache.h +++ b/cache.h @@ -1262,6 +1262,7 @@ extern const char *ident_default_email(void); extern const char *git_editor(void); extern const char *git_pager(int stdout_is_tty); extern int git_ident_config(const char *, const char *, void *); +extern void reset_ident_date(void); struct ident_split { const char *name_begin; diff --git a/ident.c b/ident.c index 139c5289d03..e20a772dde4 100644 --- a/ident.c +++ b/ident.c @@ -184,6 +184,11 @@ static const char *ident_default_date(void) return git_default_date.buf; } +void reset_ident_date(void) +{ + strbuf_reset(&git_default_date); +} + static int crud(unsigned char c) { return c <= 32 ||