From: "David Copeland" <davetron5000@gmail.com>
To: "Peter Harris" <git@peter.is-a-geek.org>
Cc: git@vger.kernel.org
Subject: Re: Can someone confirm what the contents of refs/heads/master means?
Date: Mon, 8 Dec 2008 14:42:21 -0500 [thread overview]
Message-ID: <f95d47890812081142k575264fctd77254ed3386a069@mail.gmail.com> (raw)
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:
> 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
>
next prev parent reply other threads:[~2008-12-08 19:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-08 19:23 Can someone confirm what the contents of refs/heads/master means? davetron5000
2008-12-08 19:35 ` Peter Harris
2008-12-08 19:42 ` David Copeland [this message]
2008-12-08 19:55 ` Peter Harris
2008-12-08 21:26 ` Björn Steinbrink
2008-12-08 22:21 ` David Copeland
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f95d47890812081142k575264fctd77254ed3386a069@mail.gmail.com \
--to=davetron5000@gmail.com \
--cc=git@peter.is-a-geek.org \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).