On Tue, Jun 29, 2010 at 09:55:38AM -0600, Elijah Newren <newren@xxxxxxxxx> wrote: > Well, as far as this particular if-block is concerned, blame suggests > that you and Miklos were responsible (I apologize if gmail screws up > and inserts line wrapping):: > > $ git blame -C -C -L 1020,1038 merge-recursive.c > 9047ebbc (Miklos Vajna 2008-08-12 18:45:14 +0200 1020) > if (mfi.clean && > 9047ebbc (Miklos Vajna 2008-08-12 18:45:14 +0200 1021) > sha_eq(mfi.sha, ren1->pair->two->sha1) && And if you have a look at what commit 9047ebbc does, that's really just about changing it to be part of libgit, so I could call it without fork() from builtin-merge. To sum up, I sadly have to say I don't know too much about the merge-recursive internal sematics.
Attachment:
pgpDurpia77HQ.pgp
Description: PGP signature