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

Re: [PATCH 1/2] am: add explicit "--retry" option

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 6, 2024, 16:48 UTC
Message-ID
<xmqqtti6m2yz.fsf@gitster.g>
In-Reply-To
<xmqqzfrym3fu.fsf@gitster.g>
Junio C Hamano <gitster@pobox.com> writes:
Show 9 quoted lines
> Jeff King <peff@peff.net> writes:
>
>> I think even without the test-terminal cleanup, this is a good thing.
>> Any time there is a heuristic like isatty(), we should have a way for
>> the user to be more explicit about what they want().
>
> I very often do "git am --no-3" to countermand a failed "git am -3"
> (or vice versa), so I'll be hit very hard with a need to retrain my
> fingers.  But I'll live ;-)

Ah, no, this is not about not paying attention to isatty(0), but give us an additional way. I can see how it would help our tests; it would be nicer if the feature also has real world use.

But I no longer mind the option existing.
Show 5 quoted lines
> "--retry" is a horrible word, in that it makes it sound like it will
> keep trying to apply the same patch over and over until it applies
> cleanly or something.  Can't we use "--continue" like everybody else
> (like "git rebase --continue", etc.), or would that be even more
> confusing?
Previous: Junio C HamanoNext: Jeff King
Message 4 of 9 in “dropping stdin support from test-terminal”
  1. 0/2 dropping stdin support from test-terminalJeff King, Jun 6, 2024
  2. 1/2 am: add explicit "--retry" optionJeff King, Jun 6, 2024
  3. Junio C HamanoJun 6, 2024
  4. Junio C HamanoJun 6, 2024
  5. Jeff KingJun 8, 2024
  6. Phillip WoodJun 10, 2024
  7. 2/2 test-terminal: drop stdin handlingJeff King, Jun 6, 2024
  8. Rubén JustoJun 6, 2024
  9. Rubén JustoJun 6, 2024

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.