Re: [PATCH 2/2] builtin/stash: merge index in-core

From: D. Ben Knoble <ben.knoble@gmail.com>
Date: Sep 22, 2026, 12:51 UTC
Message-ID: <CALnO6CBbQToKU-mJdRXL=XsDGMQFD2qPswKDK8sjdf7b1jCLGA@mail.gmail.com>
In-Reply-To: <CALnO6CDG4Emny7xESxN8GObaXb_P9gPHBZ857hrAvDjiMSqsKQ@mail.gmail.com>

On Tue, Sep 22, 2026 at 8:43 AM D. Ben Knoble <ben.knoble@gmail.com> wrote:

>
> Oh, but one other thing: we unconditionally reinit the merge options
> later on in do_apply_stash(). We could conditionally initialize there
> ("if (has_index)"), I suppose?

er, "!has_index" of course (which is what I originally typed and then, confused, edited).

-- 
D. Ben Knoble

$ 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.