From: Elijah Newren <newren@gmail.com>
Date: Sun, 10 Apr 2016 05:33:24 GMT
Subject: Re: [RFC/PATCH 00/18] Add --index-only option to git merge
Message-ID: <CABPp-BHrsRXu8_9oj=srATO51yaDBVUMUUGKqgL16_b6HN+-Yw@mail.gmail.com>
In-Reply-To: <1460098726-5958-1-git-send-email-newren@gmail.com>

On Thu, Apr 7, 2016 at 11:58 PM, Elijah Newren <newren@gmail.com> 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...