On Thu, Apr 7, 2016 at 11:58 PM, Elijah Newren <newren@xxxxxxxxx> wrote: > Luckily, I figured out that bug. So, that leaves just one case left > that I can't seem to figure out: read_tree_trivial. So much better, > right? Even it's name is sitting there, mocking me. "Ha ha, I'm > read_tree_*trivial* and you can't figure me out." read_tree_trivial > is a jerk. It turns out this wasn't a bug in my index-only handling of the trivial merge case; it was a pre-existing bug in git handling of trivial merges that probably no one else had ever triggered before. I'm submitting a fix with my other miscellaneous merge fixups... -- 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