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

Re: Dangers of working on a tracking branch

From
Bill Lear <rael@zopyra.com>
Date
Feb 15, 2007, 22:04 UTC
Message-ID
<17876.55542.236594.121347@lisa.zopyra.com>
In-Reply-To
<20070215215816.GA3757@coredump.intra.peff.net>
On Thursday, February 15, 2007 at 16:58:16 (-0500) Jeff King writes:
Show 15 quoted lines
>On Thu, Feb 15, 2007 at 03:53:01PM -0600, Bill Lear wrote:
>
>> Is this really the way 1.4.4.1 works?  I have (mistakenly) been
>> working on my tracking branch, committing to it, pushing it, pulling
>> in from elsewhere, shifting to new branches, etc., and I haven't lost
>> anything, and can't see what harm I've done...
>
>Sorry, I thought you were talking about v1.5. v1.4.* does not have the
>detached HEAD feature, and the default layout is to keep tracking and
>local branches in the same namespace. This means that you can checkout
>and commit to a tracking branch just as a local branch, and all changes
>will be saved. It will only bite you later, when you try to fetch into
>that tracking branch and realize that the fetch is not a fast-forward
>(remember the troubles you were having with fetches and pushes last
>week? Those were caused by working on the tracking branches).
Ok, just wanted confirmation of my (in)sanity.
Show 8 quoted lines
>> >  git checkout -b topic origin/topic
>> 
>> Sure, it is easy, but it's surprising to (our) users when they
>> do a clone and can't "jump right in", and have to spend 3 seconds
>> doing the above...
>
>Fair enough. It should be pretty simple to implement; why don't you try
>working up a patch? :)

Well, I seriously thought about it, but the git-clone code is pretty dense. It might be educational though, and since I'm the only one who wants it ... might be worth a shot.

Thank you for your help.
Bill
Previous: Jeff KingNext: Shawn O. Pearce
Message 8 of 22 in “Dangers of working on a tracking branch”
  1. Bill LearFeb 15, 2007
  2. Nicolas PitreFeb 15, 2007
  3. Bill LearFeb 15, 2007
  4. Bill LearFeb 15, 2007
  5. Jeff KingFeb 15, 2007
  6. Bill LearFeb 15, 2007
  7. Jeff KingFeb 15, 2007
  8. Bill LearFeb 15, 2007
  9. Shawn O. PearceFeb 15, 2007
  10. Bill LearFeb 15, 2007
  11. Shawn O. PearceFeb 15, 2007
  12. Jeff KingFeb 15, 2007
  13. Bill LearFeb 15, 2007
  14. Jakub NarebskiFeb 16, 2007
  15. Bill LearFeb 16, 2007
  16. Jeff KingFeb 16, 2007
  17. Bill LearFeb 16, 2007
  18. Jeff KingFeb 16, 2007
  19. Santi BéjarFeb 16, 2007
  20. Nicolas PitreFeb 16, 2007
  21. Bill LearFeb 16, 2007
  22. Nicolas PitreFeb 15, 2007

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.