Re: [GSoC][PATCH v2 5/6] rebase -i: support --ignore-date

2019-08-17 Thread Phillip Wood
On 14/08/2019 20:33, Junio C Hamano wrote: Phillip Wood writes: That's an important distinction, particularly if GIT_COMMITTER_DATE is set in the environment - are we aiming to have the author and committer dates match or are we just resetting the author date to now? Rohit - do you know which

Re: [GSoC][PATCH v2 5/6] rebase -i: support --ignore-date

2019-08-14 Thread Junio C Hamano
Phillip Wood writes: > That's an important distinction, particularly if GIT_COMMITTER_DATE is > set in the environment - are we aiming to have the author and > committer dates match or are we just resetting the author date to now? > Rohit - do you know which --ignore-date does in the am based reb

Re: [GSoC][PATCH v2 5/6] rebase -i: support --ignore-date

2019-08-14 Thread Phillip Wood
On 13/08/2019 22:45, Junio C Hamano wrote: Rohit Ashiwal writes: --ignore-date:: - This flag is passed to 'git am' to change the author date - of the rebased commits (see linkgit:git-am[1]). + Instead of using the given author date, re-set it to the value + same as co

Re: [GSoC][PATCH v2 5/6] rebase -i: support --ignore-date

2019-08-14 Thread Phillip Wood
Hi Junio & Rohit On 13/08/2019 18:21, Junio C Hamano wrote: Phillip Wood writes: +static void push_dates(struct child_process *child) +{ + time_t now = time(NULL); + struct strbuf date = STRBUF_INIT; + + strbuf_addf(&date, "@%"PRIuMAX, (uintmax_t)now); + argv_array_pus

Re: [GSoC][PATCH v2 5/6] rebase -i: support --ignore-date

2019-08-13 Thread Junio C Hamano
Rohit Ashiwal writes: > --ignore-date:: > - This flag is passed to 'git am' to change the author date > - of the rebased commits (see linkgit:git-am[1]). > + Instead of using the given author date, re-set it to the value > + same as committer (current) date. This implies --force-

Re: [GSoC][PATCH v2 5/6] rebase -i: support --ignore-date

2019-08-13 Thread Junio C Hamano
Phillip Wood writes: >> +static void push_dates(struct child_process *child) >> +{ >> +time_t now = time(NULL); >> +struct strbuf date = STRBUF_INIT; >> + >> +strbuf_addf(&date, "@%"PRIuMAX, (uintmax_t)now); >> +argv_array_pushf(&child->args, "--date=%s", date.buf); > > it doesn't

Re: [GSoC][PATCH v2 5/6] rebase -i: support --ignore-date

2019-08-13 Thread Phillip Wood
Hi Rohit This is looking better - there are a couple of memory management issues and minor nit-picks but apart from that it looks good. On 12/08/2019 20:42, Rohit Ashiwal wrote: rebase am already has this flag to "lie" about the author date by changing it to the committer (current) date. Let'

[GSoC][PATCH v2 5/6] rebase -i: support --ignore-date

2019-08-12 Thread Rohit Ashiwal
rebase am already has this flag to "lie" about the author date by changing it to the committer (current) date. Let's add the same for interactive machinery. Signed-off-by: Rohit Ashiwal --- Documentation/git-rebase.txt| 6 +-- builtin/rebase.c| 21 +++---