mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-24 09:36:10 +02:00
Code

Merge branch 'jk/reset-ident-time-per-commit' 

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
This commit is contained in:
Junio C Hamano 2016-08-10 12:33:17 -07:00
parent a0a1831b03 4d9c7e6f45
commit 24fbe00490
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/am.c
View File

@ -1840,6 +1840,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;

1
cache.h
View File

@ -1270,6 +1270,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;

5
ident.c
View File

@ -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 ||