Re: [PATCH] pull: abort by default if fast-forwarding is impossible

From: Felipe Contreras <felipe.contreras@gmail.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
	"Felipe Contreras" <felipe.contreras@gmail.com>
Cc: Alex Henrie <alexhenrie24@gmail.com>,
	Elijah Newren <newren@gmail.com>,
	Git Mailing List <git@vger.kernel.org>,
	Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] pull: abort by default if fast-forwarding is impossible
Date: Mon, 28 Jun 2021 12:39:38 -0500	[thread overview]
Message-ID: <60da095a5ce4_1a78f20847@natae.notmuch> (raw)
In-Reply-To: <87k0megtlo.fsf@evledraar.gmail.com>

Ævar Arnfjörð Bjarmason wrote:
> 
> On Sun, Jun 27 2021, Felipe Contreras wrote:

> > Personally I prefer to run prove instead, because the output is less
> > verbose, and there's a nice summary at the end:
> >
> >   prove t[0-9][0-9][0-9][0-9]-*.sh
> 
> I also like "prove" better (well, I added the support for it, so
> ...). It's generally better to use e.g.:
> 
>     make test DEFAULT_TEST_TARGET=prove GIT_PROVE_OPTS="--jobs $(nproc)"

Or just add "-j$(nproc)" to ~/.proverc so you don't need to specify
GIT_PROVE_OPTS every time.

> Since we do some basic checking via the Makefile that effectively form a
> part of our tests.
> 
> FWIW for your one-liner it can be just:
> 
>     prove t[0-9]*.sh
> 
> Alex: You might also find that if you specify --root as the path to a
> ramdisk the tests are much faster, e.g. on my Linux boxes I set
> --root=/run/user/`id -u`/git.

Or TEST_OUTPUT_DIRECTORY=/tmp/git.

-- 
Felipe Contreras