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

Re: [PATCH v2 0/2] merge-ours: sparse-index integration

From
Patrick Steinhardt <ps@pks.im>
Date
Feb 9, 2026, 15:05 UTC
Message-ID
<aYn3pnjC7WUr6jfc@pks.im>
In-Reply-To
<pull.2189.v2.git.git.1770405383.gitgitgadget@gmail.com>
On Fri, Feb 06, 2026 at 07:16:21PM +0000, Sam Bostock via GitGitGadget wrote:
Show 14 quoted lines
> This short series teaches merge-ours to work with a sparse index as a small
> step toward broader sparse-index support.
> 
> Patch 1 is a preparatory cleanup that converts merge-ours away from
> the_repository global, using the repo parameter instead.
> 
> Patch 2 adds the actual sparse-index integration and tests.
> 
> Changes since v1:
> 
>  * Patch 1: note in commit message that RUN_SETUP guarantees repo is never
>    NULL (Patrick, Junio)
>  * Patch 2: rewrite commit message to follow the project's standard log
>    message structure (Junio)
I'm happy with this version of the patch series, thanks!
Patrick
Previous: Sam Bostock via GitGitGadgetNext: Derrick Stolee
Message 10 of 11 in “merge-ours: sparse-index integration”
  1. 0/2 merge-ours: sparse-index integrationSam Bostock via GitGitGadget, Feb 6, 2026
  2. 1/2 merge-ours: drop USE_THE_REPOSITORY_VARIABLESam Bostock via GitGitGadget, Feb 6, 2026
  3. Patrick SteinhardtFeb 6, 2026
  4. Junio C HamanoFeb 6, 2026
  5. 2/2 merge-ours: integrate with sparse-indexSam Bostock via GitGitGadget, Feb 6, 2026
  6. Junio C HamanoFeb 6, 2026
  7. 0/2 merge-ours: sparse-index integrationSam Bostock via GitGitGadget, Feb 6, 2026
  8. 2/2 merge-ours: integrate with sparse-indexSam Bostock via GitGitGadget, Feb 6, 2026
  9. 1/2 merge-ours: drop USE_THE_REPOSITORY_VARIABLESam Bostock via GitGitGadget, Feb 6, 2026
  10. Patrick SteinhardtFeb 9, 2026
  11. Derrick StoleeFeb 10, 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.