From: Elijah Newren <newren@gmail.com>
Date: Fri, 24 Nov 2017 05:25:48 GMT
Subject: Re: [PATCH v3 00/33] Add directory rename detection to git
Message-ID: <CABPp-BHc8zznHyRqaJ-KvDnLu3qWDZESH2982NsZx=BHWU00UQ@mail.gmail.com>
In-Reply-To: <CABPp-BE5-MCUfUAdOBv4zYRJxqAiGdv-JGrrzQoo9SUiQwWKYA@mail.gmail.com>

On Thu, Nov 23, 2017 at 2:28 PM, Elijah Newren <newren@gmail.com> wrote:
> On Thu, Nov 23, 2017 at 3:52 AM, Adam Dinwoodie <adam@dinwoodie.org> wrote:
>> On Tuesday 21 November 2017 at 12:00 am -0800, Elijah Newren wrote:
>>> <snip>
>>>
>>>  merge-recursive.c                   | 1243 +++++++++++-
>>>  merge-recursive.h                   |   17 +
>>>  t/t3501-revert-cherry-pick.sh       |    5 +-
>>>  t/t6043-merge-rename-directories.sh | 3821 +++++++++++++++++++++++++++++++++++
>>>  t/t7607-merge-overwrite.sh          |    7 +-
>>>  unpack-trees.c                      |    4 +-
>>>  unpack-trees.h                      |    4 +
>>>  7 files changed, 4985 insertions(+), 116 deletions(-)
>>>  create mode 100755 t/t6043-merge-rename-directories.sh
>>
>> The new t6043.44 introduced in this branch is failing on my Cygwin
>> system.  I can't immeditely see what's causing the failure, but I've
>> copied the relevant verbose + shell tracing output below in the hope it
>> makes more sense to you:
>
> Thanks for reporting.  Unfortunately, I have been unable to locate or
> create a cygwin system on which to replicate the testing.  Valgrind is

Nevermind; found a system that allowed me to reproduce the problem,
even if it far more wrangling than I'd like.  I believe I have a
one-line fix, but I'm worried that attempting to fully explain it will
result in a novel-length commit message.