Re: [PATCH] Add git-filter-branch

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jun 4, 2007, 16:11 UTC
Message-ID: <Pine.LNX.4.64.0706041711500.4046@racer.site>
In-Reply-To: <4663BCDA.F1BADDD8@eudaptics.com>

Hi,

On Mon, 4 Jun 2007, Johannes Sixt wrote:

Show 6 quoted lines

> [...] any simple command like 
> 
>   git filter-branch -k orgin/master origin/next new-next
> 
> of your git.git clone will fail with the "assertion failed". (I haven't
> tried your script, yet, but cg-admin-rewritehist fails.)

As you mentioned yourself, you should say "-s origin/next". cg-admin-rewritehist will only rewrite the current branch (since cogito started out as one-branch-per-repo).

> I propose that you just get rid of the "seed" stance and don't fail if a
> commit cannot be mapped - just use it unchanged (don't forget to adjust
> the map() function, too).

It is as much for debug reasons as for consistency, so I'd rather keep it. One more safety valve for catching bugs.

> Then you can get rid of -r and use -k to specify everything you want 
> under "--not" in the rev-list.

Actually, -r is quite useful. It means "start rewriting with this commit", and saying "--not <commit>^" is _not_ the same when <commit> is a merge.

Ciao, Dscho