Re: [GSoC][PATCHl 5/6] rebase -i: support --ignore-date
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Aug 7, 2019, 19:41 UTC
- Message-ID
- <nycvar.QRO.7.76.6.1908072139190.46@tvgsbejvaqbjf.bet>
- In-Reply-To
- <20190806173638.17510-6-rohit.ashiwal265@gmail.com>
Hi Rohit,
On Tue, 6 Aug 2019, Rohit Ashiwal wrote:
Show 9 quoted lines
> @@ -1046,6 +1066,8 @@ static int run_git_commit(struct repository *r, > argv_array_push(&cmd.args, "--amend"); > if (opts->gpg_sign) > argv_array_pushf(&cmd.args, "-S%s", opts->gpg_sign); > + if (opts->ignore_date) > + argv_array_pushf(&cmd.args, "--date=%ld", time(NULL)); > if (defmsg) > argv_array_pushl(&cmd.args, "-F", defmsg, NULL); > else if (!(flags & EDIT_MSG))
I need this patch to make the code _at least_ compile on Windows again (I don't know whether it breaks the test suite yet):
-- snipsnap -- Subject: [PATCH] fixup! rebase -i: support --ignore-date
It is a mistake to believe that the return value of `time()` is always an `unsigned long`.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- sequencer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/sequencer.c b/sequencer.c index 539c0ef601b..a4c932d3407 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1070,7 +1070,8 @@ static int run_git_commit(struct repository *r, if (opts->gpg_sign) argv_array_pushf(&cmd.args, "-S%s", opts->gpg_sign); if (opts->ignore_date) - argv_array_pushf(&cmd.args, "--date=%ld", time(NULL)); + argv_array_pushf(&cmd.args, "--date=%"PRIuMAX, + (uintmax_t)time(NULL)); if (defmsg) argv_array_pushl(&cmd.args, "-F", defmsg, NULL); else if (!(flags & EDIT_MSG)) @@ -3642,7 +3643,8 @@ static int do_merge(struct repository *r, argv_array_push(&cmd.args, opts->gpg_sign); if (opts->ignore_date) argv_array_pushf(&cmd.args, - "GIT_AUTHOR_DATE=%ld", time(NULL)); + "GIT_AUTHOR_DATE=%"PRIuMAX, + (uintmax_t)time(NULL)); /* Add the tips to be merged */ for (j = to_merge; j; j = j->next) -- 2.22.0.windows.1.6.g271c090e89