Re: git: uh-oh

On 20/08/10 14:36, Robert Haas wrote:
> On Fri, Aug 20, 2010 at 9:28 AM, Magnus Hagander <magnus(at)hagander(dot)net> wrote:
>> I believe Robert had some comments/questions as well :-)
>
> What Magnus means is that I'm a grumpy old developer who complains
> about everything.
>
> Anyway, what I noticed was that we're getting stuff like this:
>
> http://git.postgresql.org/gitweb?p=git-migration-test.git;a=commit;h=586b324c255a4316d72a5757566ebe6e630df47e
>
> commit 586b324c255a4316d72a5757566ebe6e630df47e
> Author: cvs2git <>
> Date: Thu May 13 16:39:49 2010 +0000
>
> This commit was manufactured by cvs2svn to create branch 'REL8_4_STABLE'.
>
> Cherrypick from master 2010-05-13 16:39:43 UTC adunstan 'Abandon the use of
> src/pl/plperl/plperl_opmask.pl
>
> We're not getting that on EVERY back-patch, just on some of them. I
> really just want to turn this code to detect merges and cherry-picks
> OFF altogether, so that we get the original committer and commit
> message instead off the above. It's much easier to read if you're
> browsing the back-branch history, and it's probably easier to match up
> commits across branches, too.

The history that cvs2svn is aiming to represent here is this:

1) At the time of creation of the REL8_4_STABLE branch, plperl_opmask.pl
did *not* exist.

2) Later, it was added to trunk.

3) Then, someone retroactively added the branch tag to the file, marking
it as included in the REL8_4_STABLE branch. [This corresponds to the git
changeset that Robert is questioning]

4) Then, adunstan committed a change to it on the branch.

cvs2svn/git/etc seeks to faithfully represent what the result would have
been of doing a CVS checkout of the REL8_4_STABLE branch, at various
points in time, which is why this changeset is introduced.

I should also say that the autogenerated commit message is rather poor -
it should say 'update' not 'create' in this case. I'm actually looking
at fixing that.

Max.