Junio C Hamano <gitster@xxxxxxxxx> writes: > "Eric Raible" <raible@xxxxxxxxx> writes: > >> If 'empty' has any commits then the merge happens as expected. > > I think it is a bug in the git-merge rewritten in C, in "Already > uptodate!" codepath. Try reverting 18668f5 (builtin-merge: avoid run_command_v_opt() for recursive and subtree, 2008-08-28). That patch seems to be seriously broken. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
