On Thu, Nov 23, 2017 at 3:52 AM, Adam Dinwoodie [off-list ref] wrote:

On Tuesday 21 November 2017 at 12:00 am -0800, Elijah Newren wrote:

quoted

<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
running clean for me, and I find it interesting that the output shows
it did detect the rename/rename(2to1) conflict on y/d for you, and the
index has all the right values, but somehow the 'test ! -f y/d' line
isn't passing for you.

Out of curiosity:
  * What is in the y/ directory in that test?  (That is, the y/
directory within the 7b/ directory)
  * What are the full contents of the 'out' file?  (again, within the
7b/ directory)
  * What commit have you actually built and run with (maybe I'm trying
with something slightly different?)