git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Jun 28, 2021, 17:39 UTC
Message-ID
<60da095a5ce4_1a78f20847@natae.notmuch>
In-Reply-To
<87k0megtlo.fsf@evledraar.gmail.com>
Ævar Arnfjörð Bjarmason wrote:
> 
> On Sun, Jun 27 2021, Felipe Contreras wrote:
Show 9 quoted lines
> > 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.

Show 10 quoted lines
> 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
Previous: Ævar Arnfjörð BjarmasonNext: Felipe Contreras
Message 9 of 10 in “pull: abort by default if fast-forwarding is impossible”
  1. pull: abort by default if fast-forwarding is impossibleAlex Henrie, Jun 27, 2021
  2. Elijah NewrenJun 27, 2021
  3. Felipe ContrerasJun 27, 2021
  4. Elijah NewrenJun 27, 2021
  5. Felipe ContrerasJun 27, 2021
  6. Alex HenrieJun 27, 2021
  7. Felipe ContrerasJun 27, 2021
  8. Ævar Arnfjörð BjarmasonJun 28, 2021
  9. Felipe ContrerasJun 28, 2021
  10. Felipe ContrerasJun 27, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.