Re: Binary files in a linear repository

From: Dmitry Potapov <dpotapov@gmail.com>
Date: Nov 2, 2009, 16:52 UTC
Message-ID: <20091102165215.GD27126@dpotapov.dyndns.org>
In-Reply-To: <20091102160903.GA6197@atjola.homenet>

On Mon, Nov 02, 2009 at 05:09:03PM +0100, Björn Steinbrink wrote:

Show 25 quoted lines

> On 2009.11.02 18:48:31 +0300, Dmitry Potapov wrote:
> > 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.

You are right... I forgot about that somehow. So, it should be

$ git reset --soft master $ git checkout master

and only then

$ git commit

Dmitry