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

Re: [PATCH v5 00/16] Many promisor remotes

From
Christian Couder <christian.couder@gmail.com>
Date
Apr 15, 2019, 10:37 UTC
Message-ID
<CAP8UFD3p+usPw=xwW7TWBZSZNGJKBgGRDNAFUocSkhO5--dvAA@mail.gmail.com>
In-Reply-To
<xmqqmukrr52m.fsf@gitster-ct.c.googlers.com>
On Mon, Apr 15, 2019 at 11:27 AM Junio C Hamano <gitster@pobox.com> wrote:
Show 13 quoted lines
>
> Christian Couder <christian.couder@gmail.com> writes:
>
> > This patch series is based on:
> >
> > 763fb763b8 (Merge branch 'jt/batch-fetch-blobs-in-diff' into jch, 2019-04-08)
> >
> > to avoid issues with jt/batch-fetch-blobs-in-diff.
>
> Yuck.  As an experienced contributor, you should know better than
> that by now to do that.  A merge into jch/pu are rebuilt at least
> once and often three times a day, and in no way a good solid base
> to build on top.
Sorry if it creates problems.
> If you really need to depend on another topic or two, please base
> your work on a merge between 'master' (or some well known ancestor
> of it) and the tips of the topics instead.
Ok I will do that then.
Show 5 quoted lines
> Having said that, I thought that the semantic conflict has been
> corrected and the machinery to rebuild 'pu' has been replaying the
> correct resolution ever since, so there was no need for such a
> rebase?  Isn't it the case and do we still have the breakage due to
> semantic conflict with JTan's topic in 'pu'?

There is one patch in the series, Patch 8/16 (diff: use promisor-remote.h instead of fetch-object.h), that fix the breakage, so if the series is applied on top of jt/batch-fetch-blobs-in-diff, it will apply correctly and if it is not applied on top of jt/batch-fetch-blobs-in-diff then the patch can just be dropped and everything else will apply correctly. I thought that it might be better to make the fix explicit than to rely on the rebuild machinery.

Previous: Christian Couder
Message 28 of 28 in “Many promisor remotes”
  1. 00/16 Many promisor remotesChristian Couder, Apr 9, 2019
  2. 01/16 t0410: remove pipes after git commandsChristian Couder, Apr 9, 2019
  3. 02/16 fetch-object: make functions return an error codeChristian Couder, Apr 9, 2019
  4. 03/16 Add initial support for many promisor remotesChristian Couder, Apr 9, 2019
  5. 05/16 promisor-remote: add promisor_remote_reinit()Christian Couder, Apr 9, 2019
  6. 06/16 promisor-remote: use repository_format_partial_cloneChristian Couder, Apr 9, 2019
  7. 04/16 promisor-remote: implement promisor_remote_get_direct()Christian Couder, Apr 9, 2019
  8. Derrick StoleeMay 30, 2019
  9. Johannes SchindelinMay 30, 2019
  10. Derrick StoleeMay 30, 2019
  11. Johannes SchindelinMay 31, 2019
  12. Junio C HamanoMay 31, 2019
  13. Christian CouderMay 31, 2019
  14. Christian CouderJun 25, 2019
  15. 07/16 Use promisor_remote_get_direct() and has_promisor_remote()Christian Couder, Apr 9, 2019
  16. 08/16 diff: use promisor-remote.h instead of fetch-object.hChristian Couder, Apr 9, 2019
  17. 09/16 promisor-remote: parse remote.*.partialclonefilterChristian Couder, Apr 9, 2019
  18. 10/16 builtin/fetch: remove unique promisor remote limitationChristian Couder, Apr 9, 2019
  19. 12/16 partial-clone: add multiple remotes in the docChristian Couder, Apr 9, 2019
  20. 11/16 t0410: test fetching from many promisor remotesChristian Couder, Apr 9, 2019
  21. 13/16 remote: add promisor and partial clone config to the docChristian Couder, Apr 9, 2019
  22. 14/16 Remove fetch-object.{c,h} in favor of promisor-remote.{c,h}Christian Couder, Apr 9, 2019
  23. 15/16 Move repository_format_partial_clone to promisor-remote.cChristian Couder, Apr 9, 2019
  24. 16/16 Move core_partial_clone_filter_default to promisor-remote.cChristian Couder, Apr 9, 2019
  25. Junio C HamanoApr 15, 2019
  26. Junio C HamanoApr 15, 2019
  27. Christian CouderApr 15, 2019
  28. Christian CouderApr 15, 2019

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.