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

Re: [PATCH 2/6] fetch-pack: add partial clone refiltering

From
JTJonathan Tan <jonathantanmy@google.com>
Date
Feb 17, 2022, 00:05 UTC
Message-ID
<20220217000554.1978909-1-jonathantanmy@google.com>
In-Reply-To
<CACf-nVePhtm_HAzAKzcap0E8kiyyEJPY_+N+bbPcYPVUkjweFg@mail.gmail.com>
Robert Coup <robert@coup.net.nz> writes:
Show 33 quoted lines
> On Fri, 4 Feb 2022 at 18:02, Jonathan Tan <jonathantanmy@google.com> wrote:
> >
> > The approach that I would have expected is to not call
> > mark_complete_and_common_ref(), filter_refs(), everything_local(), and
> > find_common(), but your approach here is to ensure that
> > mark_complete_and_common_ref() and find_common() do not do anything.
> 
> v0: find_common() definitely still does something: during refiltering it skips
> checking the local object db, but it's still responsible for sending
> the "wants".
> 
> filter_refs() is necessary under v0 & v2 so the remote refs all get marked as
> matched, otherwise we end up erroring after the transfer with
> "error: no such remote ref refs/heads/main" etc.
> 
> > Comparing the two approaches, the advantage of yours is that we only
> > need to make the change once to support both protocol v0 and v2
> > (although the change looks more substantial than just skipping function
> > calls), but it makes the code more difficult to read in that we now have
> > function calls that do nothing. What do you think about my approach?
> 
> My original approach was to leave the negotiator in place, and just conditional
> around it in do_fetch_pack_v2 — this worked ok for protocol v2 but the v0
> implementation didn't work. After that I switched to forcing noop in [1/6]
> which made both implementations match (& tidier imo).
> 
> To make the test pass and skip those calls I need a patch like the below
> — filter_refs() is still required during refiltering for the ref-matching. To me
> this looks more complicated, but I'm happy to defer to your thinking.
> 
> Thanks,
> 
> Rob :)

Thanks for investigating this; looks like I was perhaps too optimistic in thinking that the code could be reorganized in the way I'm suggesting.

I think that it's worth checking if we could refactor the parts that are needed with --refilter out of filter_refs() and find_common() (and in doing so, make these functions do only what their names imply). I don't have time to do so right now, but I don't want to unnecessarily block this patch set either, so I'll say that ideally another reviewer (or you) would do that investigation, but I have no objection to merging this patch set in this state (other than the change of the argument name, perhaps to "--repair", and associated documentation).

Previous: Robert CoupNext: Robert Coup via GitGitGadget
Message 6 of 76 in “[RFC] partial-clone: add ability to refetch with expanded filter”
  1. 0/6 [RFC] partial-clone: add ability to refetch with expanded filterRobert Coup via GitGitGadget, Feb 1, 2022
  2. 1/6 fetch-negotiator: add specific noop initializorRobert Coup via GitGitGadget, Feb 1, 2022
  3. 2/6 fetch-pack: add partial clone refilteringRobert Coup via GitGitGadget, Feb 1, 2022
  4. Jonathan TanFeb 4, 2022
  5. Robert CoupFeb 11, 2022
  6. Jonathan TanFeb 17, 2022
  7. 3/6 builtin/fetch-pack: add --refilter optionRobert Coup via GitGitGadget, Feb 1, 2022
  8. 4/6 fetch: add --refilter optionRobert Coup via GitGitGadget, Feb 1, 2022
  9. 5/6 t5615-partial-clone: add test for --refilterRobert Coup via GitGitGadget, Feb 1, 2022
  10. 6/6 doc/partial-clone: mention --refilter optionRobert Coup via GitGitGadget, Feb 1, 2022
  11. Junio C HamanoFeb 1, 2022
  12. Robert CoupFeb 2, 2022
  13. Robert CoupFeb 16, 2022
  14. Jonathan TanFeb 2, 2022
  15. Robert CoupFeb 2, 2022
  16. Robert CoupFeb 2, 2022
  17. Jeff HostetlerFeb 7, 2022
  18. 0/8 fetch: add repair: full refetch without negotiation (was: "refiltering")Robert Coup via GitGitGadget, Feb 24, 2022
  19. 8/8 doc/partial-clone: mention --repair fetch optionRobert Coup via GitGitGadget, Feb 24, 2022
  20. 3/8 builtin/fetch-pack: add --repair optionRobert Coup via GitGitGadget, Feb 24, 2022
  21. 2/8 fetch-pack: add repairingRobert Coup via GitGitGadget, Feb 24, 2022
  22. Junio C HamanoFeb 25, 2022
  23. Robert CoupFeb 28, 2022
  24. 1/8 fetch-negotiator: add specific noop initializorRobert Coup via GitGitGadget, Feb 24, 2022
  25. Junio C HamanoFeb 25, 2022
  26. Robert CoupFeb 28, 2022
  27. 4/8 fetch: add --repair optionRobert Coup via GitGitGadget, Feb 24, 2022
  28. 5/8 t5615-partial-clone: add test for fetch --repairRobert Coup via GitGitGadget, Feb 24, 2022
  29. 6/8 maintenance: add ability to pass config optionsRobert Coup via GitGitGadget, Feb 24, 2022
  30. Junio C HamanoFeb 25, 2022
  31. Robert CoupFeb 28, 2022
  32. Junio C HamanoFeb 28, 2022
  33. Ævar Arnfjörð BjarmasonFeb 25, 2022
  34. Robert CoupFeb 28, 2022
  35. 7/8 fetch: after repair, encourage auto gc repackingRobert Coup via GitGitGadget, Feb 24, 2022
  36. Ævar Arnfjörð BjarmasonFeb 28, 2022
  37. Ævar Arnfjörð BjarmasonFeb 28, 2022
  38. Robert CoupFeb 28, 2022
  39. Junio C HamanoFeb 28, 2022
  40. Ævar Arnfjörð BjarmasonFeb 28, 2022
  41. 0/7 fetch: add repair: full refetch without negotiation (was: "refiltering")Robert Coup via GitGitGadget, Mar 4, 2022
  42. 1/7 fetch-negotiator: add specific noop initializerRobert Coup via GitGitGadget, Mar 4, 2022
  43. 3/7 builtin/fetch-pack: add --refetch optionRobert Coup via GitGitGadget, Mar 4, 2022
  44. 2/7 fetch-pack: add refetchRobert Coup via GitGitGadget, Mar 4, 2022
  45. 4/7 fetch: add --refetch optionRobert Coup via GitGitGadget, Mar 4, 2022
  46. Junio C HamanoMar 4, 2022
  47. Robert CoupMar 7, 2022
  48. Junio C HamanoMar 7, 2022
  49. Robert CoupMar 9, 2022
  50. 5/7 t5615-partial-clone: add test for fetch --refetchRobert Coup via GitGitGadget, Mar 4, 2022
  51. 6/7 fetch: after refetch, encourage auto gc repackingRobert Coup via GitGitGadget, Mar 4, 2022
  52. 7/7 doc/partial-clone: mention --refetch fetch optionRobert Coup via GitGitGadget, Mar 4, 2022
  53. Calvin WanMar 9, 2022
  54. Robert CoupMar 9, 2022
  55. Junio C HamanoMar 9, 2022
  56. Calvin WanMar 10, 2022
  57. Robert CoupMar 10, 2022
  58. Calvin WanMar 21, 2022
  59. Robert CoupMar 21, 2022
  60. 0/7 fetch: add repair: full refetch without negotiation (was: "refiltering")Robert Coup via GitGitGadget, Mar 28, 2022
  61. 1/7 fetch-negotiator: add specific noop initializerRobert Coup via GitGitGadget, Mar 28, 2022
  62. 2/7 fetch-pack: add refetchRobert Coup via GitGitGadget, Mar 28, 2022
  63. Ævar Arnfjörð BjarmasonMar 31, 2022
  64. Robert CoupApr 1, 2022
  65. 3/7 builtin/fetch-pack: add --refetch optionRobert Coup via GitGitGadget, Mar 28, 2022
  66. 5/7 t5615-partial-clone: add test for fetch --refetchRobert Coup via GitGitGadget, Mar 28, 2022
  67. Ævar Arnfjörð BjarmasonMar 31, 2022
  68. Robert CoupApr 1, 2022
  69. 4/7 fetch: add --refetch optionRobert Coup via GitGitGadget, Mar 28, 2022
  70. Ævar Arnfjörð BjarmasonMar 31, 2022
  71. Robert CoupApr 1, 2022
  72. 6/7 fetch: after refetch, encourage auto gc repackingRobert Coup via GitGitGadget, Mar 28, 2022
  73. Ævar Arnfjörð BjarmasonMar 31, 2022
  74. Robert CoupApr 1, 2022
  75. 7/7 docs: mention --refetch fetch optionRobert Coup via GitGitGadget, Mar 28, 2022
  76. Junio C HamanoMar 28, 2022

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.