From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Duy Nguyen <pclouds@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: nd/merge-quit, was Re: What's cooking in git.git (May 2019, #01; Thu, 9)
Date: Mon, 13 May 2019 16:02:27 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1905131531000.44@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <CACsJy8DTErpeoNHUkCieDafnjc3iwg6QKAp2VP-8tUNYh33tJA@mail.gmail.com>
Hi Duy,
On Fri, 10 May 2019, Duy Nguyen wrote:
> On Fri, May 10, 2019 at 3:54 AM Johannes Schindelin
> <Johannes.Schindelin@gmx.de> wrote:
> >
> > Hi Junio & Duy,
> >
> > On Thu, 9 May 2019, Junio C Hamano wrote:
> >
> > > * nd/merge-quit (2019-05-07) 2 commits
> > > - merge: add --quit
> > > - merge: remove drop_save() in favor of remove_merge_branch_state()
> > >
> > > "git merge" learned "--quit" option that cleans up the in-progress
> > > merge while leaving the working tree and the index still in a mess.
> > >
> > > Hmph, why is this a good idea?
> >
> > It also seems to work *only* on Linux. At least the tests break on macOS
> > and on Windows:
> >
> > https://dev.azure.com/gitgitgadget/git/_build/results?buildId=8313&view=ms.vss-test-web.build-test-results-tab
>
> Sorry I have no idea what the problem is. That's basically the same as
> the 'merge detects mod-256 conflicts (recursive)' test earlier but
> with rerere enabled. It does not even look like some leftover rerere
> records accidentally fix the conflict.
>
> I tried with a case-insensitive filesytem (on linux) and with
> --valgrind, no problem found. Travis on pu seemed ok with t7600 on
> mac.
>
> One difference I notice is the the failed test looks like it found the
> wrong merge base
>
> found 1 common ancestor:
> c4c4222 commit 1
>
> while my tests have "commit 0" as the base. "git log --graph
> --oneline" indicates "commit 1" is the wrong base.
>
> Something is wrong with the merge code (this has not even reached the
> new --quit code). I could change the setup steps to be more stable,
> using a simpler commit history, but this looks like something we
> should find and fix.
Yeah... someone should look at this... Someone. But who?
:-)
Well, since you seemed quite reluctant to figure out why your patches fail
the test suite, and since we're about to enter the -rc0 phase (where we
all spend all of our time to hammer out the next version, right? Right?),
I figured out I better look into it before nobody does.
Turns out that the culprit is not even hard to figure out. All I had to do
is to compare, carefully, the logs from the Azure Pipelines and from a
local run in a local Ubuntu.
It has nothing to do with our merge code. There might be bugs, but this
breakage is safely in this here patch series: the test case you introduced
relies on side effects.
Namely, when test cases 51 and 52 are skipped because of a missing GPG
prerequisite [*1*], and those two are obviously required to run for the
`git merge to fail in your test case, as you can very easily verify by
downloading the artifact containing the `trash directory.t7600-merge`
directory and re-running the last steps on Linux (where the `git -c
rerere.enabled=true merge master` *succeeds*).
In fact, you can very, very easily emulate the whole situation on your box
by running:
sh t7600-merge.sh -i -v -x --run=1-50,53-59
And then you can fix your test case so that it does not need to rely on
test cases that may, or may not, have run previously.
Ciao,
Johannes
Footnote *1*: GNU Privacy Guard is not actually missing from Git for
Windows' SDK, quite to the contrary. But it fails to start a gpg-agent due
to the fact that we pass a `--homedir` that contains a colon, something
that is totally expected on Windows, and at the same something that GNU
Privacy Guard totally cannot handle.
next prev parent reply other threads:[~2019-05-13 14:02 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-08 17:23 What's cooking in git.git (May 2019, #01; Thu, 9) Junio C Hamano
2019-05-08 17:48 ` Denton Liu
2019-05-08 18:02 ` Elijah Newren
2019-05-09 13:24 ` Phillip Wood
2019-05-10 13:49 ` Johannes Schindelin
2019-05-13 13:29 ` Phillip Wood
2019-05-09 13:44 ` Duy Nguyen
2019-05-09 20:45 ` en/fast-export-encoding, was " Johannes Schindelin
2019-05-10 0:14 ` Elijah Newren
2019-05-10 6:21 ` Johannes Sixt
2019-05-10 13:54 ` Johannes Schindelin
2019-05-09 20:54 ` nd/merge-quit, " Johannes Schindelin
2019-05-10 9:42 ` Duy Nguyen
2019-05-13 14:02 ` Johannes Schindelin [this message]
2019-05-13 14:06 ` Johannes Schindelin
2019-05-13 14:20 ` Eric Sunshine
2019-05-13 14:53 ` Johannes Schindelin
2019-05-13 18:32 ` [PATCH] tests: add a special setup where prerequisites fail Ævar Arnfjörð Bjarmason
2019-05-14 8:53 ` Johannes Schindelin
2019-05-14 9:41 ` Ævar Arnfjörð Bjarmason
2019-05-14 12:37 ` Johannes Schindelin
2019-05-14 13:39 ` Ævar Arnfjörð Bjarmason
2019-05-14 14:04 ` Johannes Schindelin
2019-06-20 20:42 ` [PATCH] tests: mark two failing tests under FAIL_PREREQS Ævar Arnfjörð Bjarmason
2019-06-21 18:04 ` Johannes Schindelin
2019-06-21 18:26 ` Ævar Arnfjörð Bjarmason
2019-06-21 20:08 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.1905131531000.44@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).