merge-ort: record the reason that we want a rename for a directory
authorElijah Newren <newren@gmail.com>
Sat, 13 Mar 2021 22:22:03 +0000 (22:22 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Mar 2021 21:32:55 +0000 (14:32 -0700)
commitfb52938eec1cf6ec3169152362fe774849f5ac9b
tree8b2d642a6de67a15bb963c4171688e675deacaa2
parenta49b55d52e7dcfd628b6328c9098d734ebe7a97d
merge-ort: record the reason that we want a rename for a directory

When one side of history renames a directory, and the other side of
history added files to the old directory, directory rename detection is
used to warn about the location of the added files so the user can
move them to the old directory or keep them with the new one.

This sets up three different types of directories:
  * directories that had new files added to them
  * directories underneath a directory that had new files added to them
  * directories where no new files were added to it or any leading path

Save this information in dirs_removed; the next several commits will
make use of this information.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diffcore-rename.c
diffcore.h
merge-ort.c