зеркало из https://github.com/microsoft/git.git
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:
Коммит
24fbe00490
|
@ -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
1
cache.h
|
@ -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
5
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 ||
|
||||
|
|
Загрузка…
Ссылка в новой задаче