Phillip Wood <phillip.wood123@xxxxxxxxx> writes:
> On 12/01/2020 16:12, Phillip Wood wrote:
>> I'm concerned that there are some bugs in this series and think
>> it may be best to revert it before releasing 2.25.0.
Let's do that.
>> Jonathan
>> Nieder posted a bug report on Friday [1] which I think is caused
>> by this series. While trying to reproduce Jonathan's bug I came
>> up with the test below which fails, but not in the same way.
>
> Doh I forgot to add --committer-date-is-author-date to the rebase
> command line in that test. It passes with that added - how
> embarrassing. However it does appear that it prefixes the date in
> GIT_COMMITTER_DATE with @@ rather than @.
>
> start of the epoch and fails to parse it. The fix for the @@ is
> quite simple, the date we read from the author script already has
> an @ so we don't need to add another.
Yes, that sounds like a minimum and straightforward fix.
In any case, the tip of 'master' (hence the one that would become
the final) is simpler to remedy by just reverting the merge, but
there are a handful of in-flight topics that may have been queued by
forking 'master' after the problematic merge was made (iow, anything
after the fifth batch for this cycle), which I'd have to be a bit
careful when I merge them down, lest they attempt to pull in the bad
topic again. But that will be something we need to worry about
after the release, not before the final.
Thanks.
[Footnote]
*1* The list of still-in-flight topics that may be contaminated with
the merge of ra/rebase-i-more-options into 'master' are:
am/test-pathspec-f-f-error-cases
am/update-pathspec-f-f-tests
bc/hash-independent-tests-part-7
dl/merge-autostash
ds/graph-horizontal-edges
en/rebase-backend
es/bugreport
es/pathspec-f-f-grep
hi/gpg-mintrustlevel
hw/advice-add-nothing
jn/promote-proto2-to-default
jn/test-lint-one-shot-export-to-shell-function
kw/fsmonitor-watchman-racefix
sg/completion-worktree
yz/p4-py3
I probably may requeue them by rebasing on top of 2.25 once the
release is done.
