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

Re: [PATCH v2 1/1] builtin/pack-objects.c: avoid iterating all refs

From
Taylor Blau <me@ttaylorr.com>
Date
Jan 20, 2021, 21:52 UTC
Message-ID
<YAimIr9j7SsmJJ55@nand.local>
In-Reply-To
<CADMWQoPrKBjLM5ABhhhCibEyJVOXQxsNkncSU6dmwjynQ1oCcQ@mail.gmail.com>
On Wed, Jan 20, 2021 at 10:46:29PM +0100, Jacob Vosmaer wrote:
Show 9 quoted lines
> On Wed, Jan 20, 2021 at 8:45 PM Jeff King <peff@peff.net> wrote:
>
> > I also rage-replaced peel_ref() with a function taking an oid so we
> > never have to do that digging again. Posted separately in its own
> > thread.
>
> That sounds like a good solution. Where does that leave my patch? Do I
> need to wait for that new commit somehow? I don't know how that works,
> "contributing to Git" wise.

Peff noted in the patch to nuke "peel_ref()" that merging his and then yours will cause a merge conflict, but it is trivial to resolve. So, I'd expect that Junio will pick up both and resolve the merge conflict when queuing.

Or, in other words, I don't think there's anything left on your part ;-). Thanks for providing your patches; there was a nice digression and I'm quite happy with where we ended up.

Thanks, Taylor

Previous: Jacob VosmaerNext: Jeff King
Message 9 of 11 in “builtin/pack-objects.c: avoid iterating all refs”
  1. 0/1 builtin/pack-objects.c: avoid iterating all refsJacob Vosmaer, Jan 20, 2021
  2. 1/1 builtin/pack-objects.c: avoid iterating all refsJacob Vosmaer, Jan 20, 2021
  3. Taylor BlauJan 20, 2021
  4. Jeff KingJan 20, 2021
  5. Taylor BlauJan 20, 2021
  6. Jacob VosmaerJan 20, 2021
  7. Jeff KingJan 20, 2021
  8. Jacob VosmaerJan 20, 2021
  9. Taylor BlauJan 20, 2021
  10. Jeff KingJan 21, 2021
  11. Jacob VosmaerJan 22, 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.