| Message ID | 20200818233630.2829739-1-jonathantanmy@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | fixup! promisor-remote: lazy-fetch objects in subprocess | expand |
Jonathan Tan <jonathantanmy@google.com> writes: > --- > Ah, sorry about that - here's a fixup. I forgot to switch the name of > the negotiator in the patch (and also because of the change to a "fetch" > subprocess, the trace is reported as "fetch>", not "git>"). Excellent. Thanks for a quick update. > > promisor-remote.c | 2 +- > t/t5300-pack-object.sh | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/promisor-remote.c b/promisor-remote.c > index 56d6d4d821..6530e26f98 100644 > --- a/promisor-remote.c > +++ b/promisor-remote.c > @@ -23,7 +23,7 @@ static int fetch_objects(const char *remote_name, > > child.git_cmd = 1; > child.in = -1; > - strvec_pushl(&child.args, "-c", "fetch.negotiationAlgorithm=null", > + strvec_pushl(&child.args, "-c", "fetch.negotiationAlgorithm=noop", > "fetch", remote_name, "--no-tags", > "--no-write-fetch-head", "--recurse-submodules=no", > "--filter=blob:none", "--stdin", NULL); > diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh > index 3d6a93343a..392201cabd 100755 > --- a/t/t5300-pack-object.sh > +++ b/t/t5300-pack-object.sh > @@ -528,7 +528,7 @@ test_expect_success 'prefetch objects' ' > TWO=$(git -C server rev-parse three_branch^) && > git -C client fetch --filter=blob:none origin "$TWO" && > GIT_TRACE_PACKET=$(pwd)/trace git -C client push origin "$TWO":refs/heads/two_branch && > - grep "git> done" trace >donelines && > + grep "fetch> done" trace >donelines && > test_line_count = 1 donelines > '
diff --git a/promisor-remote.c b/promisor-remote.c index 56d6d4d821..6530e26f98 100644 --- a/promisor-remote.c +++ b/promisor-remote.c @@ -23,7 +23,7 @@ static int fetch_objects(const char *remote_name, child.git_cmd = 1; child.in = -1; - strvec_pushl(&child.args, "-c", "fetch.negotiationAlgorithm=null", + strvec_pushl(&child.args, "-c", "fetch.negotiationAlgorithm=noop", "fetch", remote_name, "--no-tags", "--no-write-fetch-head", "--recurse-submodules=no", "--filter=blob:none", "--stdin", NULL); diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh index 3d6a93343a..392201cabd 100755 --- a/t/t5300-pack-object.sh +++ b/t/t5300-pack-object.sh @@ -528,7 +528,7 @@ test_expect_success 'prefetch objects' ' TWO=$(git -C server rev-parse three_branch^) && git -C client fetch --filter=blob:none origin "$TWO" && GIT_TRACE_PACKET=$(pwd)/trace git -C client push origin "$TWO":refs/heads/two_branch && - grep "git> done" trace >donelines && + grep "fetch> done" trace >donelines && test_line_count = 1 donelines '