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

Re: [BUG] inconsistent behavior with --set-upstream vs --set-upstream-to

From
Garrett Cooper <yaneurabeya@gmail.com>
Date
Apr 2, 2013, 17:30 UTC
Message-ID
<A4C40BCB-85DD-4BCB-8BF0-79A75DE73211@gmail.com>
In-Reply-To
<20130402172333.GB24698@sigill.intra.peff.net>
On Apr 2, 2013, at 10:23 AM, Jeff King <peff@peff.net> wrote:
Show 30 quoted lines
> On Tue, Apr 02, 2013 at 10:07:01AM -0700, Garrett Cooper wrote:
> 
>>    It looks like git branch --set-upstream-to doesn't function with 1.8.1.3 until I run --set-upstream. Is this a known bug?
> 
> No, but I do not think that is exactly what is going on.
> 
>> root@fuji-current:/usr/src # git branch --set-upstream-to origin/pjdfstest-onefs pjdfstest-onefs
>> fatal: Not a valid object name: 'origin/pjdfstest-onefs'.
> 
> This is complaining that origin/pjdfstest-onefs does not actually exist
> Does it? If the pjdfstest-onefs branch exists on the remote, do you need
> to do a "git fetch" to make sure we have a local
> refs/remotes/origin/pjdfstest-onefs tracking branch locally?
> 
>> root@fuji-current:/usr/src # git branch --set-upstream origin/pjdfstest-onefs pjdfstest-onefs
>> The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to
>> Branch origin/pjdfstest-onefs set up to track local branch pjdfstest-onefs.
> 
> This did _not_ create the remote-tracking branch refs/remotes/origin/pjdfstest-onefs.
> It created a new local branch called "origin/pjdfstest-onefs" (i.e.,
> refs/heads/origin/pjdfstest-onefs), whose upstream is another local
> branch "pjdfstest-onefs". That "backwards" order to the arguments is why
> --set-upstream is deprecated; many people have made the same mistake.
> 
>> root@fuji-current:/usr/src # git branch --set-upstream-to origin/pjdfstest-onefs pjdfstest-onefs
>> Branch pjdfstest-onefs set up to track local branch origin/pjdfstest-onefs.
> 
> Note how it says "local branch" here; you are not tracking anything at
> the origin. You are tracking a local branch that happens to have
> "origin/" in the name.
I push the branch to origin/ and then things tend to work, but since I obviously had been doing things wrong what's the correct order of operations for creating a branch and setting the upstream appropriately?

Thanks! -Garrett

PS I love git as a tool, but I really wish the workflows were simpler or more straightforward, and error messages were clearer. It seems like this would help prevent usage errors like this..
Previous: Jeff KingNext: Jeff King
Message 3 of 15 in “[BUG] inconsistent behavior with --set-upstream vs --set-upstream-to”
  1. Garrett CooperApr 2, 2013
  2. Jeff KingApr 2, 2013
  3. Garrett CooperApr 2, 2013
  4. Jeff KingApr 2, 2013
  5. 0/5 branch --set-upstream-to error-message improvementsJeff King, Apr 2, 2013
  6. 1/5 t3200: test --set-upstream-to with bogus refsJeff King, Apr 2, 2013
  7. 2/5 branch: factor out "upstream is not a branch" error messagesJeff King, Apr 2, 2013
  8. Garrett CooperApr 2, 2013
  9. Garrett CooperApr 2, 2013
  10. 3/5 branch: improve error message for missing --set-upstream-to refJeff King, Apr 2, 2013
  11. 4/5 branch: mention start_name in set-upstream error messagesJeff King, Apr 2, 2013
  12. Garrett CooperApr 2, 2013
  13. 5/5 branch: give advice when tracking start-point is missingJeff King, Apr 2, 2013
  14. Junio C HamanoApr 2, 2013
  15. Jonathan NiederApr 2, 2013

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.