Re: Bug? Interactive rebase with reword after conflict

From: Elijah Newren <newren@gmail.com>
Date: Aug 13, 2018, 14:37 UTC
Message-ID: <CABPp-BHkD0Va_Mm+sFDyBH3gwCuR6UD-b3C07YcdS1x3QCzsRQ@mail.gmail.com>
In-Reply-To: <CA+wscc=TKnWc+Dtq6U=EFZKWEd-0afwFD+mmfR53rA9Ts9toDA@mail.gmail.com>

Hi,

On Mon, Aug 13, 2018 at 5:26 AM Dániel Vörös <daniel.voros@gmail.com> wrote:

Show 5 quoted lines

> Hey All,
>
> I'm seeing some weird behavior when doing interactive rebase of a
> single commit with reword if there's a conflict. The rebased commit
> gets "squashed" into the target commit and is not a child of that.

This was previously reported by "ch <cr@onlinehome.de>"[1] and fixed in commit a9279c678588 ("sequencer: do not squash 'reword' commits when we hit conflicts", 2018-06-19). This commit is part of current master, but has not yet made it into a release. So, sadly, we don't have a version you can update to to get the fix, unless you want to build from source and either cherry-pick the change (it applles cleanly to 2.18.0) or build a current version of master. However, it should be part of 2.19 when that comes out.

[1] https://public-inbox.org/git/8e28202a-8646-53e8-8c22-389d61791c70@onlinehome.de/

Show 6 quoted lines

> I've asked this question in the git-users group first a few weeks ago,
> but got no explanation:
> https://groups.google.com/forum/?fromgroups#!topic/git-users/1X15nAts3mg
>
> Please refer to the link above for detailed repro steps (reproducible
> with 2.18.0).

Thanks for reporting, and sorry we don't have an immediate solution for you. It's coming, though.

Elijah