Hi,
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.
So that merge between these two branches needs to become an "evil merge"
(or should I say "blessed merge", or even a "merge with a blessing"?). I
have this patch, tentatively, for the `shears/pu` branch [*1*], which
seems to fix the test here:
-- snip --
Subject: [PATCH] fixup??? Merge branch 'cc/multi-promisor' into pu
The `cc/multi-promisor` patch series and the
`jt/batch-fetch-blobs-in-diff` patch series have a semantic conflict:
the former replaces checks for `repository_format_partial_clone` with
checks for `has_promisor_remote()`, while the latter introduces such a
check.
Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
---
diff.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/diff.c b/diff.c
index fa12b5d04a..86278ce676 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
@@ -6493,7 +6494,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.
*/
-- snap --
Junio, would you terribly mind adopting this?
Ciao,
Dscho
Footnote *1*: I started again to maintain `shears/*` branches in
https://github.com/git-for-windows/git which essentially are Git for
Windows' patch thicket rebased to all four integration branches of
upstream (or "core") Git. I try my best at keeping the CI green on those,
meaning that I liberally add commits on top that are neither in Git for
Windows' `master` nor in core Git's branches.
