From: Jeff King <peff@peff.net>
To: marcnarc@xiplink.com
Cc: git@vger.kernel.org
Subject: Re: [PATCHv4 0/3] fetch: Only call a new ref a "branch" if it's under refs/heads/.
Date: Tue, 17 Apr 2012 15:29:59 -0700 [thread overview]
Message-ID: <20120417222959.GD10797@sigill.intra.peff.net> (raw)
In-Reply-To: <1334614130-31826-1-git-send-email-marcnarc@xiplink.com>
On Mon, Apr 16, 2012 at 06:08:47PM -0400, marcnarc@xiplink.com wrote:
>
> It turns out that ref->peer_ref is always NULL in update_local_ref(). So I
> made its caller pass in the full remote ref as a new parameter. I also added
> a unit test.
Hrm. So yeah, it is because the "struct ref" we create is not from the
ref_map, but is a newly created ref based on the local side (and I had
my refs backwards before; the remote ref is the "real" ref, and the
local version is found in peer_ref, not the other way around).
But I couldn't help but notice that store_updated_refs already has this
exact same "what do we call it to the user" logic in it, which is what
goes into FETCH_HEAD. Shouldn't we just be passing this "kind" flag down
to update_local_ref, and then this copy of the logic can go away
entirely?
-Peff
next prev parent reply other threads:[~2012-04-17 22:30 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-13 17:08 [PATCHv2] fetch: Only call a new ref a "branch" if it's under refs/heads/ marcnarc
2012-04-13 20:07 ` Jonathan Nieder
2012-04-16 14:26 ` Marc Branchaud
2012-04-13 21:13 ` Jeff King
2012-04-13 21:53 ` Jonathan Nieder
2012-04-13 22:39 ` Junio C Hamano
2012-04-16 14:58 ` Marc Branchaud
2012-04-16 15:00 ` Jeff King
2012-04-16 15:52 ` [PATCHv3] fetch: Use the remote's ref name to decide how to describe new refs marcnarc
2012-04-16 16:10 ` Jonathan Nieder
2012-04-16 17:59 ` Junio C Hamano
2012-04-16 20:21 ` Marc Branchaud
2012-04-16 22:08 ` [PATCHv4 0/3] fetch: Only call a new ref a "branch" if it's under refs/heads/ marcnarc
2012-04-16 22:08 ` [PATCH 1/3] submodules: recursive fetch also checks new tags for submodule commits marcnarc
2012-04-16 22:08 ` [PATCH 2/3] fetch: Pass both the full remote ref and its short name to update_local_ref() marcnarc
2012-04-16 22:08 ` [PATCH 3/3] fetch: Use the remote's ref name to decide how to describe new refs marcnarc
2012-04-16 22:34 ` Jonathan Nieder
2012-04-17 7:53 ` Zbigniew Jędrzejewski-Szmek
2012-04-17 7:57 ` Jonathan Nieder
2012-04-17 8:39 ` Zbigniew Jędrzejewski-Szmek
2012-04-17 14:23 ` Marc Branchaud
2012-04-17 15:18 ` Jonathan Nieder
2012-04-17 15:26 ` [PATCHv4 0/3] fetch: Only call a new ref a "branch" if it's under refs/heads/ Junio C Hamano
2012-04-17 15:28 ` Junio C Hamano
2012-04-17 19:30 ` Marc Branchaud
2012-04-17 22:29 ` Jeff King [this message]
2012-04-16 16:08 ` [PATCHv2] " Jonathan Nieder
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=20120417222959.GD10797@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=marcnarc@xiplink.com \
/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).