From: Marc Branchaud <marcnarc@xiplink•com>
To: marcnarc@xiplink•com
Cc: git@vger•kernel.org, Junio C Hamano <gitster@pobox•com>,
Jonathan Nieder <jrnieder@gmail•com>, Jeff King <peff@peff•net>
Subject: Re: [PATCHv3] fetch: Use the remote's ref name to decide how to describe new refs.
Date: Mon, 16 Apr 2012 16:21:14 -0400 [thread overview]
Message-ID: <4F8C7F3A.9070801@xiplink.com> (raw)
In-Reply-To: <1334591542-25136-1-git-send-email-marcnarc@xiplink.com>
Apologies - this breaks quite a few tests!
For example, t1507-rev-parse-upstream.sh test 5 segfaults.
I'll take another stab at it...
M.
On 12-04-16 11:52 AM, marcnarc@xiplink•com wrote:
> From: Marc Branchaud <marcnarc@xiplink•com>
>
> Also, only call a new ref a "branch" if it's under refs/heads/.
>
> Signed-off-by: Marc Branchaud <marcnarc@xiplink•com>
> ---
>
> Re-rolled to work with the remote's ref names.
>
> As before, this is atop of Jens's submodule-recursion fix.
>
> Technically there are now 3 different changes in this patch:
> 1. Switch to using remote ref names.
> 2. Use prefixcomp() consistently.
> 3. Only call a new ref a "branch" if its' under refs/heads.
>
> Should I split this up?
>
> M.
>
>
> builtin/fetch.c | 13 +++++++++++--
> 1 file changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/fetch.c b/builtin/fetch.c
> index cfb43df..063c63b 100644
> --- a/builtin/fetch.c
> +++ b/builtin/fetch.c
> @@ -293,14 +293,23 @@ static int update_local_ref(struct ref *ref,
> const char *msg;
> const char *what;
> int r;
> - if (!strncmp(ref->name, "refs/tags/", 10)) {
> + /*
> + * Nicely describe what we're fetching.
> + * Base this on the remote's ref names, as they're
> + * more likely to follow a standard layout.
> + */
> + if (!prefixcmp(ref->peer_ref->name, "refs/tags/")) {
> msg = "storing tag";
> what = _("[new tag]");
> }
> - else {
> + else if (!prefixcmp(ref->peer_ref->name, "refs/heads/")) {
> msg = "storing head";
> what = _("[new branch]");
> }
> + else {
> + msg = "storing ref";
> + what = _("[new ref]");
> + }
>
> if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
> (recurse_submodules != RECURSE_SUBMODULES_ON))
next prev parent reply other threads:[~2012-04-16 20:21 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 [this message]
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=4F8C7F3A.9070801@xiplink.com \
--to=marcnarc@xiplink$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=jrnieder@gmail$(echo .)com \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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