From: Junio C Hamano <gitster@pobox.com>
To: "Carlos Martín Nieto" <cmn@elego.de>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 2/2] fetch: handle overlaping refspecs on --prune
Date: Fri, 28 Feb 2014 10:04:32 -0800 [thread overview]
Message-ID: <xmqqy50vun9r.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1393590104.5277.19.camel@centaur.cmartin.tk> ("Carlos Martín Nieto"'s message of "Fri, 28 Feb 2014 13:21:44 +0100")
Carlos Martín Nieto <cmn@elego.de> writes:
> ... However, we now
> have 'origin/master' and 'origin/pr/5' both of which match the
> 'refs/remotes/origin/*' pattern. The current behaviour is to stop at the
> first match, which would mark it as stale as there is no
> 'refs/heads/pr/5' branch in the remote.
OK, but with a later pattern, we can find out that it came from pull/5
that was advertised by the remote. If we had origin/pr/1 when the
remote no longer has pull/1, then we can say that is stale.
Makes sense. Thanks for an explanation.
I wonder how well --prune would work on a repository in pre 1.5
layout, where all branches were copied to local refs/heads/
hierarchy except for 'master' (which is renamed to 'origin'). Does
it have a similar issue? Do we end up pruning refs/heads/origin
away because we do not see it on the remote end, or we somehow
already deal with it and not have to worry about it?
next prev parent reply other threads:[~2014-02-28 18:04 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-27 9:00 [PATCH 1/2] fetch: add a failing test for prunning with overlapping refspecs Carlos Martín Nieto
2014-02-27 9:00 ` [PATCH 2/2] fetch: handle overlaping refspecs on --prune Carlos Martín Nieto
2014-02-27 10:21 ` Michael Haggerty
2014-02-27 19:29 ` Carlos Martín Nieto
2014-02-27 20:19 ` Junio C Hamano
2014-02-27 20:41 ` Junio C Hamano
2014-02-28 12:21 ` Carlos Martín Nieto
2014-02-28 18:04 ` Junio C Hamano [this message]
2014-03-24 19:24 ` Junio C Hamano
2014-02-27 20:18 ` [PATCH 1/2] fetch: add a failing test for prunning with overlapping refspecs Eric Sunshine
2014-02-27 20:19 ` Eric Sunshine
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=xmqqy50vun9r.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=cmn@elego.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.
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 NNTP newsgroup(s).