On Wed, Nov 22, 2017 at 11:24 AM, Stefan Beller <sbeller@xxxxxxxxxx> wrote: > On Tue, Nov 21, 2017 at 5:12 PM, Elijah Newren <newren@xxxxxxxxx> wrote: >> On Tue, Nov 21, 2017 at 4:42 PM, Stefan Beller <sbeller@xxxxxxxxxx> wrote: >>> On Tue, Nov 21, 2017 at 12:00 AM, Elijah Newren <newren@xxxxxxxxx> wrote: >>>> This patchset introduces directory rename detection to merge-recursive; I'm > In my first round of review I only looked over the tests to see if I'd > find the behavior intuitive, I spared the implementation, as Junio seemed > to have reviewed a couple patches of the v1 implementation. > > Now I also looked over the implementation and quite like it, though > I'd be happy if others would also have a look. > > All but one comment were minor style nits, which are no big deal; > the other remark that I was musing about was whether we want to use > strbufs in the new code instead of e.g. sprintfs to extend strings. > And I'd think we would want to use them unless there are compelling > reasons not to. Thanks for the reviews! I've fixed up the style issues already and will take a look into switching over to strbuf.