Re: [PATCH 4/4] Add git-rewrite-commits

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jul 8, 2007, 16:37 UTC
Message-ID: <Pine.LNX.4.64.0707081729040.4248@racer.site>
In-Reply-To: <1183911808787-git-send-email-skimo@liacs.nl>

Hi,

On Sun, 8 Jul 2007, skimo@liacs.nl wrote:

Show 13 quoted lines

> 	bash-3.00$ time git-filter-branch test
> 	Rewrite 274fe3dfb8e8c7d0a6ce05138bdb650de7b459ea (425/425)
> 	Rewritten history saved to the test branch
> 
> 	real    0m30.845s
> 	user    0m13.400s
> 	sys     0m19.640s
> 
> 	bash-3.00$ time git-rewrite-commits
> 
> 	real    0m0.223s
> 	user    0m0.080s
> 	sys     0m0.140s

That is to be expected. After all, the first is a script. However, I really have ask: how often per hour do you want to run that program?

Show 10 quoted lines

> The command line is more reminiscent of git-log.
> For example you can say
> 
> 	git-rewrite-commits --all
> 
> to incorporate grafts in all branches, or
> 
> 	git rewrite-commits --author='!Darl McBribe' --all
> 
> to remove all commits by Darl McBribe.

I am really unhappy that so much is talked about filtering out commits. That is amost certainly not what you want in most cases. In particular, I suspect that most users would expect the _changes_ filtered out by such a command, which is just not true.

Further, I do not see much value in making this operation faster. It is meant to be a one-time operation, for example when you open-source a product and have to cull a lot of history that you must not show for legal reasons. It is a one-shot operation. And having a script which works reliably is more valuable than having two programs, each with its own set of bugs.

So there are two things I see here that filter-branch cannot do yet. The first is to rewrite _all_ branches, which should be easy to do, it only has to be done.

The second is to rewrite the commit messages so that the hashes are mapped, too. But that should be relatively easy, too: you can provide a message filter, and you can use the provided "map" function. If this seems to be what many people need, you can write a simple function and put it into filter-branch for common use.

BTW I am not at all opposed to changing the name from filter-branch to something that fits better.

Ciao, Dscho