Merge branch 'en/merge-recursive-directory-rename-fixes'
authorJunio C Hamano <gitster@pobox.com>
Sun, 10 Nov 2019 09:02:13 +0000 (18:02 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 10 Nov 2019 09:02:13 +0000 (18:02 +0900)
commitd9800351d3386db0c306fde03976d8475d7409a6
treee2a4b6bff5bc15b9acce073477ab86cc62f50c96
parent0c51181ffb178a6581ecb471091cbd2d0c48f165
parentda1e295e008ba016eef008385afb2c20c7fc3ff8
Merge branch 'en/merge-recursive-directory-rename-fixes'

When all files from some subdirectory were renamed to the root
directory, the directory rename heuristics would fail to detect that
as a rename/merge of the subdirectory to the root directory, which has
been corrected.

* en/merge-recursive-directory-rename-fixes:
  t604[236]: do not run setup in separate tests
  merge-recursive: fix merging a subdirectory into the root directory
  merge-recursive: clean up get_renamed_dir_portion()
merge-recursive.c