All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: marcnarc@xiplink.com
Cc: git@vger.kernel.org
Subject: Re: [PATCHv2] fetch: Only call a new ref a "branch" if it's under refs/heads/.
Date: Fri, 13 Apr 2012 17:13:50 -0400	[thread overview]
Message-ID: <20120413211350.GD7919@sigill.intra.peff.net> (raw)
In-Reply-To: <1334336904-18649-1-git-send-email-marcnarc@xiplink.com>

On Fri, Apr 13, 2012 at 01:08:24PM -0400, marcnarc@xiplink.com wrote:

> diff --git a/builtin/fetch.c b/builtin/fetch.c
> index cfb43df..b6f737e 100644
> --- a/builtin/fetch.c
> +++ b/builtin/fetch.c
> @@ -293,14 +293,18 @@ static int update_local_ref(struct ref *ref,
>  		const char *msg;
>  		const char *what;
>  		int r;
> -		if (!strncmp(ref->name, "refs/tags/", 10)) {
> +		if (!prefixcmp(ref->name, "refs/tags/")) {
>  			msg = "storing tag";
>  			what = _("[new tag]");
>  		}
> -		else {
> +		else if (!prefixcmp(ref->name, "refs/heads/")) {
>  			msg = "storing head";
>  			what = _("[new branch]");
>  		}
> +		else {
> +			msg = "storing ref";
> +			what = _("[new ref]");
> +		}

Hmm. The ref->name we are comparing here is the local side. So if I am
fetching a new branch "foo" from the remote into a local
"refs/remotes/origin/foo" tracking ref, it used to say:

    From ../parent
     * [new branch]      master     -> origin/master

Now it says:

    From ../parent
     * [new ref]         master     -> origin/master

while refs/remotes/* are not technically branches in our side, I think
from the user's perspective, it is true that we have fetched a branch.
Should we be calling refs/remotes/* branches, too? Should we be checking
the remote's name for the item instead of the local one?

-Peff

  parent reply	other threads:[~2012-04-13 21:14 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 [this message]
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
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=20120413211350.GD7919@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 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.