From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Michael Haggerty <mhagger@alum.mit.edu>
Subject: Re: [PATCH] refs: speed up is_refname_available
Date: Thu, 11 Sep 2014 14:31:43 -0400 [thread overview]
Message-ID: <20140911183143.GB18382@peff.net> (raw)
In-Reply-To: <xmqqy4tqdr1r.fsf@gitster.dls.corp.google.com>
On Thu, Sep 11, 2014 at 10:07:28AM -0700, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
>
> > This has a fairly straightforward conflict with the ref-transaction
> > stuff in pu. The "oldrefname" parameter to is_refname_available became a
> > list of items;
>
> Hmph, the trouble I had while reading the conflicts was about the
> new "we skip these when repacking", not "oldrefname".
>
> Will check your suggested resolution later today. Thanks.
I didn't see any conflict related to repacking. If I am reading
54e696fc433 correctly, the single "oldrefname" became a list "skip" in
the name_conflict_* code. My series dropped name_conflict_*, but gave a
similar adaptation to the replacement.
The "skip while repacking" code is repack_without_refs, but I don't
think I touched anything that conflicted there.
-Peff
prev parent reply other threads:[~2014-09-11 18:31 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-10 10:17 [PATCH] refs: speed up is_refname_available Jeff King
2014-09-10 11:11 ` [PATCH v2] " Jeff King
2014-09-10 22:21 ` Junio C Hamano
2014-09-11 1:39 ` Jeff King
2014-09-10 22:22 ` Junio C Hamano
2014-09-11 17:07 ` [PATCH] " Junio C Hamano
2014-09-11 18:31 ` Jeff King [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140911183143.GB18382@peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mhagger@alum.mit.edu \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.