From: Junio C Hamano <gitster@pobox.com>
To: Christian Couder <christian.couder@gmail.com>
Cc: git@vger.kernel.org, "Jeff King" <peff@peff.net>,
"Ben Peart" <Ben.Peart@microsoft.com>,
"Jonathan Tan" <jonathantanmy@google.com>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Nguyen Thai Ngoc Duy" <pclouds@gmail.com>,
"Mike Hommey" <mh@glandium.org>,
"Lars Schneider" <larsxschneider@gmail.com>,
"Eric Wong" <e@80x24.org>,
"Christian Couder" <chriscool@tuxfamily.org>,
"Jeff Hostetler" <jeffhost@microsoft.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Beat Bolli" <dev+git@drbeat.li>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Ramsay Jones" <ramsay@ramsayjones.plus.com>
Subject: Re: [PATCH v5 00/16] Many promisor remotes
Date: Mon, 15 Apr 2019 19:30:54 +0900 [thread overview]
Message-ID: <xmqqimvfr25d.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <xmqqmukrr52m.fsf@gitster-ct.c.googlers.com> (Junio C. Hamano's message of "Mon, 15 Apr 2019 18:27:45 +0900")
Junio C Hamano <gitster@pobox.com> writes:
> 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.
> ...
> 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.
Well, I've done this myself by first queuing these on 763fb763b8 and
then made a merge between jt/batch-fetch-blobs-in-diff and master
and applied these pathes on top of the result. You should be able
to see the resulting topic replacing the old one in 'pu' in todays
pushout.
Now I can lose the semantic conflict resolution the rebuilding
machinery was keeping, which makes things a bit simpler ;-)
next prev parent reply other threads:[~2019-04-15 10:30 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-09 16:11 [PATCH v5 00/16] Many promisor remotes Christian Couder
2019-04-09 16:11 ` [PATCH v5 01/16] t0410: remove pipes after git commands Christian Couder
2019-04-09 16:11 ` [PATCH v5 02/16] fetch-object: make functions return an error code Christian Couder
2019-04-09 16:11 ` [PATCH v5 03/16] Add initial support for many promisor remotes Christian Couder
2019-04-09 16:11 ` [PATCH v5 04/16] promisor-remote: implement promisor_remote_get_direct() Christian Couder
2019-05-30 17:21 ` Derrick Stolee
2019-05-30 20:46 ` Johannes Schindelin
2019-05-30 20:54 ` Derrick Stolee
2019-05-31 11:35 ` Johannes Schindelin
2019-05-31 16:14 ` Junio C Hamano
2019-05-31 5:10 ` Christian Couder
2019-06-25 13:50 ` Christian Couder
2019-04-09 16:11 ` [PATCH v5 05/16] promisor-remote: add promisor_remote_reinit() Christian Couder
2019-04-09 16:11 ` [PATCH v5 06/16] promisor-remote: use repository_format_partial_clone Christian Couder
2019-04-09 16:11 ` [PATCH v5 07/16] Use promisor_remote_get_direct() and has_promisor_remote() Christian Couder
2019-04-09 16:11 ` [PATCH v5 08/16] diff: use promisor-remote.h instead of fetch-object.h Christian Couder
2019-04-09 16:11 ` [PATCH v5 09/16] promisor-remote: parse remote.*.partialclonefilter Christian Couder
2019-04-09 16:11 ` [PATCH v5 10/16] builtin/fetch: remove unique promisor remote limitation Christian Couder
2019-04-09 16:11 ` [PATCH v5 11/16] t0410: test fetching from many promisor remotes Christian Couder
2019-04-09 16:11 ` [PATCH v5 12/16] partial-clone: add multiple remotes in the doc Christian Couder
2019-04-09 16:11 ` [PATCH v5 13/16] remote: add promisor and partial clone config to " Christian Couder
2019-04-09 16:11 ` [PATCH v5 14/16] Remove fetch-object.{c,h} in favor of promisor-remote.{c,h} Christian Couder
2019-04-09 16:11 ` [PATCH v5 15/16] Move repository_format_partial_clone to promisor-remote.c Christian Couder
2019-04-09 16:11 ` [PATCH v5 16/16] Move core_partial_clone_filter_default " Christian Couder
2019-04-15 9:27 ` [PATCH v5 00/16] Many promisor remotes Junio C Hamano
2019-04-15 10:30 ` Junio C Hamano [this message]
2019-04-15 10:39 ` Christian Couder
2019-04-15 10:37 ` Christian Couder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqimvfr25d.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=Ben.Peart@microsoft.com \
--cc=chriscool@tuxfamily.org \
--cc=christian.couder@gmail.com \
--cc=dev+git@drbeat.li \
--cc=e@80x24.org \
--cc=git@vger.kernel.org \
--cc=jeffhost@microsoft.com \
--cc=jonathantanmy@google.com \
--cc=jrnieder@gmail.com \
--cc=larsxschneider@gmail.com \
--cc=mh@glandium.org \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=ramsay@ramsayjones.plus.com \
--cc=sunshine@sunshineco.com \
--cc=szeder.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).