From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 12/12] receive-pack: avoid duplicates between our refs and alternates
Date: Wed, 25 Jan 2017 12:02:30 -0800 [thread overview]
Message-ID: <xmqq60l2c3hl.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170124004818.7resjwbe6ldqjfyx@sigill.intra.peff.net> (Jeff King's message of "Mon, 23 Jan 2017 19:48:18 -0500")
Jeff King <peff@peff.net> writes:
> We de-duplicate ".have" refs among themselves, but never
> check if they are duplicates of our local refs. It's not
> unreasonable that they would be if we are a "--shared" or
> "--reference" clone of a similar repository; we'd have all
> the same tags.
>
> We can handle this by inserting our local refs into the
> oidset, but obviously not suppressing duplicates (since the
> refnames are important).
Makes sense.
> +extract_ref_advertisement () {
> + perl -lne '
> + # \\ is there to skip capabilities after \0
> + /push< ([^\\]+)/ or next;
> + exit 0 if $1 eq "0000";
> + print $1;
> + '
Parsing TRACE_PACKET output? Yuck. But I think this has to do, as
any other solution will bound to be uglier.
> +test_expect_success 'receive-pack de-dupes .have lines' '
> + git init shared &&
> + git -C shared commit --allow-empty -m both &&
> + git clone -s shared fork &&
> + (
> + cd shared &&
> + git checkout -b only-shared &&
> + git commit --allow-empty -m only-shared &&
> + git update-ref refs/heads/foo HEAD
> + ) &&
> +
> + # Notable things in this expectation:
> + # - local refs are not de-duped
> + # - .have does not duplicate locals
> + # - .have does not duplicate itself
> + local=$(git -C fork rev-parse HEAD) &&
> + shared=$(git -C shared rev-parse only-shared) &&
> + cat >expect <<-EOF &&
> + $local refs/heads/master
> + $local refs/remotes/origin/HEAD
> + $local refs/remotes/origin/master
> + $shared .have
> + EOF
We may want to sort this thing and the extracted one when comparing;
the order of the entries is not part of the feature we cast in stone.
> +
> + GIT_TRACE_PACKET=$(pwd)/trace git push fork HEAD:foo &&
> + extract_ref_advertisement <trace >refs &&
> + test_cmp expect refs
> +'
> +
> test_done
next prev parent reply other threads:[~2017-01-25 20:02 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-24 0:37 [PATCH 0/12] reducing resource usage of for_each_alternate_ref Jeff King
2017-01-24 0:38 ` [PATCH 01/12] for_each_alternate_ref: handle failure from real_pathdup() Jeff King
2017-01-25 18:26 ` Junio C Hamano
2017-01-24 0:39 ` [PATCH 02/12] for_each_alternate_ref: stop trimming trailing slashes Jeff King
2017-01-24 0:40 ` [PATCH 03/12] for_each_alternate_ref: use strbuf for path allocation Jeff King
2017-01-25 18:29 ` Junio C Hamano
2017-01-25 18:40 ` Jeff King
2017-01-24 0:40 ` [PATCH 04/12] for_each_alternate_ref: pass name/oid instead of ref struct Jeff King
2017-01-24 0:44 ` [PATCH 05/12] for_each_alternate_ref: replace transport code with for-each-ref Jeff King
2017-01-25 19:00 ` Junio C Hamano
2017-01-24 0:45 ` [PATCH 06/12] clone: disable save_commit_buffer Jeff King
2017-01-25 19:11 ` Junio C Hamano
2017-01-25 19:27 ` Jeff King
2017-01-25 19:35 ` Jeff King
2017-01-25 21:07 ` Jeff King
2017-01-24 0:45 ` [PATCH 07/12] fetch-pack: cache results of for_each_alternate_ref Jeff King
2017-01-25 19:21 ` Junio C Hamano
2017-01-25 19:47 ` Jeff King
2017-01-24 0:46 ` [PATCH 08/12] add oidset API Jeff King
2017-01-24 20:26 ` Ramsay Jones
2017-01-24 20:35 ` Jeff King
2017-01-24 0:47 ` [PATCH 09/12] receive-pack: use oidset to de-duplicate .have lines Jeff King
2017-01-25 19:32 ` Junio C Hamano
2017-01-25 19:54 ` Jeff King
2017-01-24 0:47 ` [PATCH 10/12] receive-pack: fix misleading namespace/.have comment Jeff King
2017-01-24 0:48 ` [PATCH 11/12] receive-pack: treat namespace .have lines like alternates Jeff King
2017-01-25 19:51 ` Junio C Hamano
2017-01-25 19:58 ` Jeff King
2017-01-27 17:45 ` Lukas Fleischer
2017-01-27 17:58 ` Jeff King
2017-01-27 20:42 ` Junio C Hamano
2017-01-24 0:48 ` [PATCH 12/12] receive-pack: avoid duplicates between our refs and alternates Jeff King
2017-01-25 20:02 ` Junio C Hamano [this message]
2017-01-25 20:05 ` Jeff King
2017-01-24 1:33 ` [PATCH 0/12] reducing resource usage of for_each_alternate_ref Brandon Williams
2017-01-24 2:12 ` Jeff King
2017-02-08 20:52 ` [PATCH v2 0/11] " Jeff King
2017-02-08 20:52 ` [PATCH v2 01/11] for_each_alternate_ref: handle failure from real_pathdup() Jeff King
2017-02-08 20:52 ` [PATCH v2 02/11] for_each_alternate_ref: stop trimming trailing slashes Jeff King
2017-02-08 20:52 ` [PATCH v2 03/11] for_each_alternate_ref: use strbuf for path allocation Jeff King
2017-02-08 20:52 ` [PATCH v2 04/11] for_each_alternate_ref: pass name/oid instead of ref struct Jeff King
2017-02-08 20:53 ` [PATCH v2 05/11] for_each_alternate_ref: replace transport code with for-each-ref Jeff King
2017-02-08 20:53 ` [PATCH v2 06/11] fetch-pack: cache results of for_each_alternate_ref Jeff King
2017-02-08 20:53 ` [PATCH v2 07/11] add oidset API Jeff King
2017-02-08 20:53 ` [PATCH v2 08/11] receive-pack: use oidset to de-duplicate .have lines Jeff King
2017-02-08 20:53 ` [PATCH v2 09/11] receive-pack: fix misleading namespace/.have comment Jeff King
2017-02-08 20:53 ` [PATCH v2 10/11] receive-pack: treat namespace .have lines like alternates Jeff King
2017-02-08 20:53 ` [PATCH v2 11/11] receive-pack: avoid duplicates between our refs and alternates 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=xmqq60l2c3hl.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).