On Fri, Sep 05, 2008 at 05:09:32PM -0700, Junio C Hamano <gitster@xxxxxxxxx> wrote: > > I think it is a bug in the git-merge rewritten in C, in "Already > > uptodate!" codepath. I can't reproduce it with master, so I don't think this problem was introduced by the C rewrite. > Try reverting 18668f5 (builtin-merge: avoid run_command_v_opt() for > recursive and subtree, 2008-08-28). That patch seems to be seriously > broken. Yes, that works around the problem. I'll try to send a fix later today.
Attachment:
pgpvaGiFJqDca.pgp
Description: PGP signature
