diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-08-12 09:16:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-12 09:16:56 -0700 |
| commit | f4fd6276619dfe7cf9a024730ca65b1bd0b3492b (patch) | |
| tree | aa54c677b20d12cbca00ee7d606b0e0184206a24 /builtin/am.c | |
| parent | 8e4b75a97beaf88aa83ab2b18c07bd8ae4954f28 (diff) | |
| parent | 4d9c7e6f45523ce1bf9615689e6c4e13fd82ed5d (diff) | |
| download | git-f4fd6276619dfe7cf9a024730ca65b1bd0b3492b.tar.gz git-f4fd6276619dfe7cf9a024730ca65b1bd0b3492b.tar.xz | |
Merge branch 'jk/reset-ident-time-per-commit' into maint
Not-so-recent rewrite of "git am" that started making internal
calls into the commit machinery had an unintended regression, in
that no matter how many seconds it took to apply many patches, the
resulting committer timestamp for the resulting commits were all
the same.
* jk/reset-ident-time-per-commit:
am: reset cached ident date for each patch
Diffstat (limited to 'builtin/am.c')
| -rw-r--r-- | builtin/am.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/am.c b/builtin/am.c index 0d97f2fab..00e4a0981 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; |