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

Re: [PATCH] stash: allow custom conflict labels for pop

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 1, 2026, 17:58 UTC
Message-ID
<xmqqy0ch481b.fsf@gitster.g>
In-Reply-To
<93321573-2164-4bbd-b884-7d6287c400b3@gmail.com>
Phillip Wood <phillip.wood123@gmail.com> writes:
Show 9 quoted lines
> On 30/09/2026 22:33, Junio C Hamano wrote:
>> "Harald Nordgren via GitGitGadget" <gitgitgadget@gmail.com> writes:
>> 
>> This is not a new problem, but is it just me who finds this
>> "feature" more about "because we can do it", not "because we need to
>> have it"?  Stepping back a bit, why did we add these three options
>> to "stash apply" in the first place?
>
> So we could have meaningful conflict labels for "git checkout -m".

Yes, I know (as I already written in the part you quoted below your "Thanks"). What I didn't realize was that we spawned "git stash apply" as a subprocess from sequencer, not as an internal subroutine call, in do_stash_apply(). Of course, with that calling sequence, we do need to expose these options to "git stash apply".

Show 10 quoted lines
>> If there is no good use case, perhaps what we should be doing is to
>> remove from "git stash apply" these three options, not adding the
>> same to another command.
>
> I think having better labels for commands that are autostashing is a 
> good use case for adding labels to "apply" but I'm not convinced there 
> is a good use case for "pop". As you say below is anyone really going to 
> type out the labels when they pop a stash? Scripts should probably be 
> using "create" and "apply" rather than "push" and "pop" so are already 
> covered.
Yup.
Previous: Phillip WoodNext: Harald Nordgren
Message 4 of 6 in “stash: allow custom conflict labels for pop”
  1. stash: allow custom conflict labels for popHarald Nordgren via GitGitGadget, Sep 30, 2026
  2. Junio C HamanoSep 30, 2026
  3. Phillip WoodOct 1, 2026
  4. Junio C HamanoOct 1, 2026
  5. Harald NordgrenOct 2, 2026
  6. Junio C HamanoOct 2, 2026

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.