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, 06:49 UTC
Message-ID
<xmqq35hrrtze.fsf@gitster.g>
In-Reply-To
<bcb069c7-f104-a494-1862-30709dc6f8a0@gmail.com>
Bagas Sanjaya <bagasdotme@gmail.com> writes:
Show 22 quoted lines
> On 5/3/22 12:51, Junio C Hamano wrote:
>> 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.
>> 
>
> Ah I see.
>
> So the left-hand side of verbose report (local branch) is actually
> the value of branch."net-next".merge, right?
Not really.  It comes from
	[remote "net-next"]
	    remote = https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
	    fetch = refs/heads/*:refs/remotes/net-next/*

and the fact that the remote happens to have only one branch under its refs/heads/ hierarchy. Fetch does not care all that much about "branch.*.merge" (which is what I said---the configuration is not all that relevant to "git fetch").

Previous: Bagas Sanjaya
Message 4 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.