git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Incorrect branch information after fetching (local branch != remote branch)

From
Junio C Hamano <gitster@pobox.com>
Date
May 3, 2022, 05:51 UTC
Message-ID
<xmqq7d73rwnq.fsf@gitster.g>
In-Reply-To
<9b3a9023-cd73-2e9d-64f1-7cc7e53d9b54@gmail.com>
Bagas Sanjaya <bagasdotme@gmail.com> writes:
Show 22 quoted lines
> 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.

Previous: Bagas SanjayaNext: Bagas Sanjaya
Message 2 of 4 in “Incorrect branch information after fetching (local branch != remote branch)”
  1. Bagas SanjayaMay 3, 2022
  2. Junio C HamanoMay 3, 2022
  3. Bagas SanjayaMay 3, 2022
  4. Junio C HamanoMay 3, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.