Re: Binary files in a linear repository

From: Björn Steinbrink <b.steinbrink@gmx.de>
Date: Nov 2, 2009, 16:09 UTC
Message-ID: <20091102160903.GA6197@atjola.homenet>
In-Reply-To: <20091102154831.GC27126@dpotapov.dyndns.org>

On 2009.11.02 18:48:31 +0300, Dmitry Potapov wrote:

Show 17 quoted lines

> On Mon, Nov 02, 2009 at 04:08:25PM +0100, Markus Hitter wrote:
> >
> > Now I'm thinking about a much simpler solution: Simply declare the  
> > current set of files as (a modified) master/com005 and commit them. A  
> > "cp $GIT_DIR/master $GIT_DIR/HEAD" followed by a commit would do it.
> >
> > Now my question: Is it safe to tweak the files in $GIT_DIR this way or 
> > will this corrupt the repository?
> 
> You probably should use 'git update-ref' if you want to change HEAD
> manually. But it seems to me that you do not need even that. All what
> you need is:
> 
> $ git reset --soft master
> 
> and then commit your changes (git reset --soft does not touch the index
> file nor the working tree at all).

But then you still have to do: git checkout master git merge HEAD@{1}

To actually update the "master" branch head. The reset doesn't re-attach HEAD.

Björn