Re: [PATCH v9 5/5] mergetool: add automerge_enabled tool-specific override function
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jan 8, 2021, 15:04 UTC
- Message-ID
- <nycvar.QRO.7.76.6.2101081602410.2213@tvgsbejvaqbjf.bet>
- In-Reply-To
- <xmqq1rewl9qe.fsf@gitster.c.googlers.com>
Hi Junio,
On Thu, 7 Jan 2021, Junio C Hamano wrote:
Show 22 quoted lines
> Seth House <seth@eseth.com> writes: > > > On Wed, Jan 06, 2021 at 10:38:09PM -0800, Junio C Hamano wrote: > >> By the way, do you have any idea why we see test breakages only on > >> macos when this topic is merged to 'seen'? > > > > Thanks for those links. I have an OSX machine nearby and will > > investigate tomorrow. > > > > Related: are the Windows tests affected by this patch? I wanted to check > > for myself but I've been struggling with getting Git-for-Windows > > installed in a VM. > > On the left hand side of the page I gave the links to, it shows that > 'windows-build' job is failing (and windows-test jobs are not run as > a consequence). I am not sure why it failed, but I have a feeling > that the build machinery hasn't even seen the code being built when > it errored out. > > cf. https://github.com/git/git/runs/1659807855?check_suite_focus=true#step:3:40 > > So we cannot tell (yet).
There are unfortunately intermittent failures while downloading git-sdk-64-minimal; That's what this job is seeing. I restarted that build: https://github.com/git/git/runs/1659807855?check_suite_focus=true#step:3:40
Ciao, Dscho