From: Jonathan Tan <jonathantanmy@google.com>
To: Johannes.Schindelin@gmx.de
Cc: jonathantanmy@google.com, git@vger.kernel.org
Subject: Re: [PATCH] negotiator/skipping: skip commits during fetch
Date: Thu, 26 Jul 2018 12:16:09 -0700 [thread overview]
Message-ID: <20180726191609.176343-1-jonathantanmy@google.com> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.1807261233300.71@tvgsbejvaqbjf.bet>
> Hi Jonathan,
>
> On Mon, 16 Jul 2018, Jonathan Tan wrote:
>
> > t/t5552-skipping-fetch-negotiator.sh | 179 +++++++++++++++++++
>
> This test seems to be failing consistently in the recent `pu` builds:
>
> https://git-for-windows.visualstudio.com/git/_build/results?buildId=14337&view=logs
>
> Could you have a look, please?
Hmm...on my Linux computer, this test passes on both pu (as of the time
of writing) and 838143aa5c ("Merge branch 'ab/newhash-is-sha256' into
pu", 2018-07-25) (pu at the time of that build, according to the website
you linked above). If you could rerun that test with additional code,
could you add a "cat trace" and show me what the client sends? When I do
that, the relevant parts are:
packet: fetch> have 9ab46928dc282aa09f4dbf96893a252e058e7e8e
packet: fetch> have dc824fafb05f3229aedf1f320bbe572e35364dfe
packet: fetch> have caef059de69917b9119176a11b88afcef769331d
packet: fetch> have 41bd8dc092ee110ba80e350a346ec507ab2e42a0
packet: fetch> have e9a2c092a8e911567a377c881a7f6031e7f892ea
packet: fetch> done
which is exactly as I (and the test) expect.
Two possible reasons for the discrepancy that I can think of offhand are
that (1) my computer generates different commits from your test system,
and (2) the priority queue pops commits in a different order. For (1),
that's not possible because the SHA-1s are the same (as can be seen by
comparing your link and the "have" lines I quoted above), and for (2),
the code seems OK:
static int compare(const void *a_, const void *b_, void *unused)
{
const struct entry *a = a_;
const struct entry *b = b_;
return compare_commits_by_commit_date(a->commit, b->commit, NULL);
}
Let me know if you can observe the output of "cat trace" or if you have
any other ideas.
next prev parent reply other threads:[~2018-07-26 19:16 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-16 18:44 [PATCH] negotiator/skipping: skip commits during fetch Jonathan Tan
2018-07-16 23:02 ` Junio C Hamano
2018-07-26 10:36 ` Johannes Schindelin
2018-07-26 14:14 ` Johannes Schindelin
2018-07-26 19:16 ` Jonathan Tan [this message]
2018-07-27 15:48 ` Johannes Schindelin
2018-08-03 13:07 ` Johannes Schindelin
2018-07-31 15:02 ` Ævar Arnfjörð Bjarmason
2018-07-31 18:02 ` Jonathan Tan
2018-08-01 15:18 ` [PATCH 0/2] negotiator: improve recent behavior + docs Ævar Arnfjörð Bjarmason
2018-08-01 20:25 ` Jonathan Tan
2018-08-01 21:13 ` Ævar Arnfjörð Bjarmason
2018-09-27 19:41 ` Jonathan Tan
2018-09-27 20:41 ` Ævar Arnfjörð Bjarmason
2018-09-27 22:46 ` Jonathan Tan
2018-08-01 15:18 ` [PATCH 1/2] negotiator: unknown fetch.negotiationAlgorithm should error out Ævar Arnfjörð Bjarmason
2018-08-01 15:18 ` [PATCH 2/2] fetch doc: cross-link two new negotiation options Ævar Arnfjörð Bjarmason
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=20180726191609.176343-1-jonathantanmy@google.com \
--to=jonathantanmy@google.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
/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).