From: Christian Couder <christian.couder@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Junio C Hamano <gitster@pobox.com>
Cc: "SZEDER Gábor" <szeder.dev@gmail.com>,
"Jonathan Tan" <jonathantanmy@google.com>,
git <git@vger.kernel.org>, "Jeff King" <peff@peff.net>
Subject: Re: [PATCH v2 2/2] diff: batch fetching of missing blobs
Date: Sun, 7 Apr 2019 08:00:08 +0200 [thread overview]
Message-ID: <CAP8UFD1qK61MtJ-XeMuwY4W2V0CdHeZQC9rQap1M+nEeaLmBJQ@mail.gmail.com> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.1904051528130.41@tvgsbejvaqbjf.bet>
Hi,
On Fri, Apr 5, 2019 at 3:38 PM Johannes Schindelin
<Johannes.Schindelin@gmx.de> wrote:
> On Thu, 4 Apr 2019, SZEDER Gábor wrote:
>
> > On Fri, Mar 29, 2019 at 02:39:28PM -0700, Jonathan Tan wrote:
> > > diff --git a/t/t4067-diff-partial-clone.sh b/t/t4067-diff-partial-clone.sh
> > > new file mode 100755
> > > index 0000000000..349851be7d
> > > --- /dev/null
> > > +++ b/t/t4067-diff-partial-clone.sh
> > > @@ -0,0 +1,103 @@
> > > +#!/bin/sh
> > > +
> > > +test_description='behavior of diff when reading objects in a partial clone'
> > > +
> > > +. ./test-lib.sh
> > > +
> > > +test_expect_success 'git show batches blobs' '
> > > + test_when_finished "rm -rf server client trace" &&
> > > +
> > > + test_create_repo server &&
> > > + echo a >server/a &&
> > > + echo b >server/b &&
> > > + git -C server add a b &&
> > > + git -C server commit -m x &&
> > > +
> > > + test_config -C server uploadpack.allowfilter 1 &&
> > > + test_config -C server uploadpack.allowanysha1inwant 1 &&
> > > + git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
> > > +
> > > + # Ensure that there is exactly 1 negotiation by checking that there is
> > > + # only 1 "done" line sent. ("done" marks the end of negotiation.)
> > > + GIT_TRACE_PACKET="$(pwd)/trace" git -C client show HEAD &&
> > > + grep "git> done" trace >done_lines &&
> > > + test_line_count = 1 done_lines
> >
> > These patches and 'cc/multi-promisor' don't seem to work well
> > together, and all tests checking 'test_line_count = 1 done_lines' in
> > this test script fail in current 'pu', because there are two
> > "git> done" lines.
>
> I investigated a little further, and it would seem that it is neither this
> patch nor the cc/multi-promisor patches that introduce the problem, but
> the merge between the two... The latter tries to get away from using the
> global variable `repository_format_partial_clone` while this patch
> introduces another user.
Thanks for investigating! Yeah, that's part of the problem.
The fix I would suggest is:
diff --git a/diff.c b/diff.c
index f685ab10b5..a2b1241f83 100644
--- a/diff.c
+++ b/diff.c
@@ -26,6 +26,7 @@
#include "parse-options.h"
#include "help.h"
#include "fetch-object.h"
+#include "promisor-remote.h"
#ifdef NO_FAST_WORKING_DIRECTORY
#define FAST_WORKING_DIRECTORY 0
@@ -6489,7 +6490,7 @@ static void add_if_missing(struct oid_array *to_fetch,
void diffcore_std(struct diff_options *options)
{
- if (repository_format_partial_clone) {
+ if (has_promisor_remote()) {
/*
* Prefetch the diff pairs that are about to be flushed.
*/
@@ -6506,8 +6507,7 @@ void diffcore_std(struct diff_options *options)
/*
* NEEDSWORK: Consider deduplicating the OIDs sent.
*/
- fetch_objects(repository_format_partial_clone,
- to_fetch.oid, to_fetch.nr);
+ promisor_remote_get_direct(to_fetch.oid, to_fetch.nr);
oid_array_clear(&to_fetch);
}
I will send a new version with the above soon based on top of
jt/batch-fetch-blobs-in-diff in pu.
next prev parent reply other threads:[~2019-04-07 6:00 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-26 22:09 [PATCH] diff: batch fetching of missing blobs Jonathan Tan
2019-03-27 10:10 ` SZEDER Gábor
2019-03-27 22:02 ` Johannes Schindelin
2019-03-28 6:52 ` Jeff King
2019-03-29 21:39 ` [PATCH v2 0/2] Batch fetching of missing blobs in diff and show Jonathan Tan
2019-03-29 21:39 ` [PATCH v2 1/2] sha1-file: support OBJECT_INFO_FOR_PREFETCH Jonathan Tan
2019-04-05 14:13 ` Johannes Schindelin
2019-04-05 22:00 ` Jeff King
2019-03-29 21:39 ` [PATCH v2 2/2] diff: batch fetching of missing blobs Jonathan Tan
2019-04-04 2:47 ` SZEDER Gábor
2019-04-05 13:38 ` Johannes Schindelin
2019-04-07 6:00 ` Christian Couder [this message]
2019-04-08 2:36 ` Junio C Hamano
2019-04-08 5:51 ` Junio C Hamano
2019-04-08 6:03 ` Junio C Hamano
2019-04-08 6:45 ` Christian Couder
2019-04-08 6:40 ` Christian Couder
2019-04-08 7:59 ` Junio C Hamano
2019-04-08 9:56 ` Christian Couder
2019-04-05 9:39 ` Duy Nguyen
2019-04-05 17:09 ` [PATCH] fixup! " Jonathan Tan
2019-04-05 20:16 ` Johannes Schindelin
2019-04-06 4:17 ` Duy Nguyen
2019-04-08 3:46 ` Junio C Hamano
2019-04-08 4:06 ` Junio C Hamano
2019-04-08 9:58 ` Duy Nguyen
2019-04-09 6:36 ` Junio C Hamano
2019-04-05 14:17 ` [PATCH v2 2/2] " Johannes Schindelin
2019-04-05 22:12 ` [PATCH v2 0/2] Batch fetching of missing blobs in diff and show Jeff King
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=CAP8UFD1qK61MtJ-XeMuwY4W2V0CdHeZQC9rQap1M+nEeaLmBJQ@mail.gmail.com \
--to=christian.couder@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.com \
--cc=peff@peff.net \
--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).