{"thread":{"id":"11842","subject":"New behavior for git-branch?","startedAt":"2008-02-02T16:57:52Z","lastAt":"2008-02-03T14:42:27Z","messageCount":2,"participants":["walt"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"67144","messageId":"fo27d0$gs7$1@ger.gmane.org","threadId":"11842","inReplyTo":null,"subject":"New behavior for git-branch?","fromName":"walt","fromEmail":"wa1ter@myrealbox.com","sentAt":"2008-02-02T16:57:52Z","receivedAt":"2008-02-02T16:57:52Z","isPatch":false,"sender":{"key":"wa1ter@myrealbox.com","avatar":null},"body":"Hi,\n\nI've been tracking Junio's git repository for a year or two\nand I've used git-bisect many times, but yesterday I got very\ndisoriented while using git-bisect and git-branch together.\nI think I was confused by the output of 'git-branch -v'.\n\nAs an example of the new behavior of git-branch, here is what\nI see this morning after pulling from Linus:\n\n$git-branch -v\n* master ae9458d Merge git://git.infradead.org/battery-2.6\n   origin 8af03e7 Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc\n\n(I discovered the -a flag just this morning.)\n\n$git-branch -av\n* master        ae9458d Merge git://git.infradead.org/battery-2.6\n   origin        8af03e7 Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc\n   origin/master aa62999 x86: fix bootup crash in native_read_tsc()\n\nIn my confusion yesterday, I think I created a new 'origin' which\nhas nothing to do with Linus' repository -- but I'm not sure.\n\nThe old behavior of 'git-branch' always listed 'origin' as well\nas 'master', but (I think?) that 'origin' is no longer displayed\nusing just -v.  Is this correct?  If so, what would be the right\nway to un-bollocks my local repository?\n"},{"id":"67215","messageId":"fo4jr4$7c0$1@ger.gmane.org","threadId":"11842","inReplyTo":"fo27d0$gs7$1@ger.gmane.org","subject":"Re: New behavior for git-branch?","fromName":"walt","fromEmail":"wa1ter@myrealbox.com","sentAt":"2008-02-03T14:42:27Z","receivedAt":"2008-02-03T14:42:27Z","isPatch":false,"sender":{"key":"wa1ter@myrealbox.com","avatar":null},"body":"walt wrote:\n> ...\n> $git-branch -av\n> * master ae9458d Merge git://git.infradead.org/battery-2.6\n> origin 8af03e7 Merge branch 'for-2.6.25' of\n> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc\n> origin/master aa62999 x86: fix bootup crash in native_read_tsc()\n>\n> In my confusion yesterday, I think I created a new 'origin' which\n> has nothing to do with Linus' repository -- but I'm not sure...\n\nI fixed it by copying these new settings from Junio's config:\n\nremote.origin.fetch=+refs/heads/*:refs/remotes/origin/*\nbranch.master.remote=origin\nbranch.master.merge=refs/heads/master\n"}]}