From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 10 Nov 2019 09:02:13 +0000 (+0900)
Subject: Merge branch 'en/merge-recursive-directory-rename-fixes'
X-Git-Tag: v2.25.0-rc0~144
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d9800351d3386db0c306fde03976d8475d7409a6;p=thirdparty%2Fgit.git

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

d9800351d3386db0c306fde03976d8475d7409a6