Merge branch 'js/am-3-merge-recursive-direct'

diff --git a/builtin/am.c b/builtin/am.c
index cfb79ea906f9c9911244845af2a984afe9a73843..739b34dcf25a1355246bed436ec7fdb4723d7ca7 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1822,6 +1822,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;