From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sun, 23 Mar 2008 12:11:59 GMT
Subject: Re: Recording cherry-picked commits
Message-ID: <alpine.LSU.1.00.0803231309370.4353@racer.site>
In-Reply-To: <ae63f8b50803230407u7062586dy26fab7d98090efb9@mail.gmail.com>

Hi,

On Sun, 23 Mar 2008, Jean-Baptiste Quenot wrote:

> 2008/3/22, Rafael Garcia-Suarez <rgarciasuarez@gmail.com>:
> > On 22/03/2008, Jean-Baptiste Quenot <jbq@caraldi.com> wrote:
> >  > What about using a hidden ".gitcherry" file in the current branch 
> >  > to store the commits that have been applied?  With the simple shell 
> >  > scripts below I'm able to achieve the same effect as svnmerge:
> >
> > (.gitcherry should really be at the root of the git repository, not in 
> > the current directory)
> 
> Yes that's what I meant.  Usually I'm always at the root when I'm 
> cherry-picking changes but you're right the script could be improved in 
> this regard.  Is there a trick to find the root repository directory?

Actually, you should not store it in the root of the working tree, but in 
the git dir (because it should never be tracked!), and then you can make 
it non-hidden:

	file="$(git rev-parse --git-dir)"/cherry

> > What happens to .gitcherry across merges ?  I think your solution 
> > isn't robust enough.
> 
> The .gitcherry is merged like any other file.  I'm just trying to
> mimic svnmerge here, not to reinvent anything.  As Git does not have
> file metadata, I'm using a plain text file to achieve this.

Ah, I see, so you _want_ to track it.  I do not like this idea personally, 
but then, I will not use .gitcherry anyway.

	file="$(git rev-parse --show-cdup)"/.gitcherry

Hth,
Dscho