From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 24 Oct 2019 04:34:25 +0000 (+0900)
Subject: Merge branch 'en/merge-recursive-directory-rename-fixes' into jch
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a2735d2c658647394e678556255d946e270b6e6;p=git

Merge branch 'en/merge-recursive-directory-rename-fixes' into jch

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()
---

4a2735d2c658647394e678556255d946e270b6e6