This series adds some testcases based on the tensorflow repository issue
reported by Glen Choo at [1], demonstrating bugs in both the ort and
recursive strategies. It also provides a fix for the ort strategy.

Changes since v3:

 * Remove use of for-initializer

Changes since v2:

 * Added a couple preparatory cleanup patches
 * Added a comment about why sub1/newfile is important to the new testcases
 * A couple other minor code cleanups

Changes since v1:

 * Fixed some wording issues in comments, and added a bit more details to
   one of the commit messages

[1]
https://lore.kernel.org/git/kl6lee006mle.fsf@chooglen-macbookpro.roam.corp.google.com/

Elijah Newren (5):
  t6423: add tests of dual directory rename plus add/add conflict
  merge-ort: small cleanups of check_for_directory_rename
  merge-ort: make a separate function for freeing struct collisions
  merge-ort: shuffle the computation and cleanup of potential collisions
  merge-ort: fix issue with dual rename and add/add conflict

 merge-ort.c                         |  74 +++++++++++++-------
 t/t6423-merge-rename-directories.sh | 105 ++++++++++++++++++++++++++++
 2 files changed, 153 insertions(+), 26 deletions(-)

base-commit: e54793a95afeea1e10de1e5ad7eab914e7416250

Submitted-As: https://lore.kernel.org/git/pull.1268.v4.git.1656984823.gitgitgadget@gmail.com
In-Reply-To: https://lore.kernel.org/git/pull.1268.git.1655871651.gitgitgadget@gmail.com
In-Reply-To: https://lore.kernel.org/git/pull.1268.v2.git.1656572225.gitgitgadget@gmail.com
In-Reply-To: https://lore.kernel.org/git/pull.1268.v3.git.1656653000.gitgitgadget@gmail.com