Re: Can someone confirm what the contents of refs/heads/master means?
- From
David Copeland <davetron5000@gmail.com>
- Date
- Dec 8, 2008, 19:42 UTC
- Message-ID
- <f95d47890812081142k575264fctd77254ed3386a069@mail.gmail.com>
- In-Reply-To
- <eaa105840812081135p56eceb97yb968575b11a7f985@mail.gmail.com>
Thanks for the info :)
The reason I edited by hand is when I was on trunk (e.g. git checkout trunk), I did a git svn dcommit and it worked, but said "you aren't on a branch", so I was concerned I might be in some weird state (i.e. if trunk isn't a branch, can I make a branch off of it?)
Dave
On Mon, Dec 8, 2008 at 2:35 PM, Peter Harris <git@peter.is-a-geek.org> wrote:
Show 24 quoted lines
> On Mon, Dec 8, 2008 at 2:23 PM, davetron5000 wrote: >> >> So, I overwrote refs/heads/master with the contents of refs/remotes/ >> trunk (i.e. the SHA-1 of the svn trunk). >> >> Things seem to be working; git svn dcommit commits to the trunk and >> git svn rebase updates from svn's trunk. >> >> So, I want to make sure that refs/heads/master actuall does, in fact, >> point to the head revision of whatever branch is considered "master". > > I do believe so, yes. That, or an entry in packed-refs. > >> Can someone comfirm this (or provide the actual explanation if I'm >> wrong?) > > Overwriting internal files by hand feels a little too much like work > for my taste. I would have done something more like "git reset --hard > trunk" (or, if not on master, "git branch -D master; git branch master > trunk" ), but of course you can feel free to do things the hard way if > you prefer. :-) > > Peter Harris >