Re: Rebase-via-merge behavior difference between Linux and Windows

From: Elijah Newren <newren@gmail.com>
Date: Apr 1, 2020, 06:35 UTC
Message-ID: <CABPp-BFDx2j5Kf584Myb6wuEq5G7wbogJ2vos8OTDsh+ySfk8w@mail.gmail.com>
In-Reply-To: <CAGyf7-FUjCefwGjvCcwmjO=GADd5S0cU_=S_tVy4nMaj07+rQA@mail.gmail.com>

On Tue, Mar 31, 2020 at 4:25 PM Bryan Turner <bturner@atlassian.com> wrote:

Show 30 quoted lines

>
> With the default rebase backend changing from "apply" to "merge" in
> 2.26, I've seen several threads about behavior changes between the two
> backends. This is _not_ one of those (although, as I mention at the
> end, the "apply" backend doesn't appear to have this issue).
>
> Instead, what I'm observing is a behavior difference between the same
> "merge" backend depending on whether the command is run on Linux or
> Windows.
>
> A little context: Bitbucket Server has a set of zipped repositories
> that provide consistent initial state, and we have tests that download
> those zips and then run various Git commands against them and verify
> we get expected outcomes. These same tests run on both Windows and
> Linux.
>
> Using our merge test repository[1], one such test performs the following steps:
> * Unzip bare repository
> * `git clone --shared -b branch_that_differ_by_empty_commit_trgt
> <unzipped> rebase-test`
> * `git rebase -q --no-verify 7549846524f8aed2bd1c0249993ae1bf9d3c9998
> 298924b8c403240eaf89dcda0cce7271620ab2f6`
>
> 298924b8c40 is an empty commit (i.e. `git commit --allow-empty`), and
> is the only commit not already reachable from 7549846524f.
>
> On Linux, when this test completes, "HEAD" in "rebase-test" is
> 7549846524f because the empty commit was discarded. This is the
> expected behavior. On Windows, "HEAD" is a new empty commit, which
> causes our test to fail.

I don't have a Windows box to test, but it's good that you are seeing the correct behavior there. I do have a Linux box, and cannot duplicate the behavior you state, even downloading the zip you mentioned and following your steps to reproduce. Actually, I did reproduce that behavior the first time because I was accidentally using git-2.25.0. But with git-2.26.0 on Linux, I see a new empty commit after rebasing, as expected.

Is there any chance you accidentally ran with an older git version when on Linux? If you really were using git 2.26.0 on Linux...then I'm totally confused at how you got that behavior.

And yes, I am stating the exact opposite expectation than what you did; let me quote from the relevant bits of the 2.26.0 manpage for git rebase:

BEHAVIORAL DIFFERENCES ----------------------- ... Empty commits ~~~~~~~~~~~~~

The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior.

The merge backend keeps intentionally empty commits. Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty.

So the apply backend has the wrong behavior, we just haven't bothered updating it. Perhaps we should.