]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fdbcdfc 3585d0e)
Merge branch 'en/merge-dir-rename-corner-case-fix'
authorJunio C Hamano <gitster@pobox.com>
Sat, 17 Jul 2021 00:42:45 +0000 (17:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 17 Jul 2021 00:42:45 +0000 (17:42 -0700)
commitd3b88be1b450caa1244ed756c2fd7d7baadeafd8
tree85d3ade6a69a5e466bf9f09dc8cbb752824d442etree | snapshot
parentfdbcdfcf61a64a1c2d2dd58c1a9111b45b6c1536commit | diff
parent3585d0ea232b1a9c5498ab5785b11f61e93967c8commit | diff
Merge branch 'en/merge-dir-rename-corner-case-fix'

The merge code had funny interactions between content based rename
detection and directory rename detection.

* en/merge-dir-rename-corner-case-fix:
  merge-recursive: handle rename-to-self case
  merge-ort: ensure we consult df_conflict and path_conflicts
  t6423: test directory renames causing rename-to-self
merge-ort.c diff1 | diff2 | blob | history
merge-recursive.c diff1 | diff2 | blob | history
t/t6423-merge-rename-directories.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.