git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Bagas Sanjaya <bagasdotme@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Incorrect branch information after fetching (local branch != remote branch)
Date: Mon, 02 May 2022 22:51:37 -0700	[thread overview]
Message-ID: <xmqq7d73rwnq.fsf@gitster.g> (raw)
In-Reply-To: <9b3a9023-cd73-2e9d-64f1-7cc7e53d9b54@gmail.com> (Bagas Sanjaya's message of "Tue, 3 May 2022 11:58:10 +0700")

Bagas Sanjaya <bagasdotme@gmail.com> writes:

> I have a copy of linux.git (Linux kernel) repository, with following
> branch mapping:
>
>   * master -> torvalds/master (Linus' mainline tree)
>   * linux-5.*.y -> stable/linux-5.*.y (Stable tree)
>   * net-next -> net-next/master (net-next tree)
>
> When I fetch the mainline tree (torvalds/master), I get the expected
> branch fetching info:
>
> From https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
>    672c0c5173427e..9050ba3a61a4b5  master     -> torvalds/master
>
> When I fetch net-next, I get possibly incorrect branch name instead:
>
> From https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
>    6e28f56c0d1d97..0530a683fc858a  master     -> net-next/master
>
> I expected that net-next (local branch name) is displayed instead of
> master in this case.
>
> Thanks.

I may be entirely missing what you are raising as a problem, but visiting

https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/

shows that their primary branch is called 'master'.

The verbose report left by "git fetch" tells us what branch they
have is used to update what branch we have, so I think this is
pretty much expected.

I am puzzled by your mention of 'net-next' (local).

You may have

    [branch "net-next"]
        remote = net-next
	merge = master

and that is where your expectation on the local may be coming from,
but it wouldn't be all that relevant to "git fetch". The update of
the local branch will happen long after "git fetch" is done.

Besides, you may have more than one local branch that is forked from
the same remotes/net-next/master remote-tracking branch and at that
point "git fetch" wouldn't be able to tell which one of these
multiple local branches to show.

  reply	other threads:[~2022-05-03  5:51 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-03  4:58 Incorrect branch information after fetching (local branch != remote branch) Bagas Sanjaya
2022-05-03  5:51 ` Junio C Hamano [this message]
2022-05-03  6:42   ` Bagas Sanjaya
2022-05-03  6:49     ` Junio C Hamano

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=xmqq7d73rwnq.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=bagasdotme@gmail.com \
    --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).