From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Mar 2025 07:26:10 +0000 (+0900)
Subject: Merge branch 'en/merge-process-renames-crash-fix'
X-Git-Tag: v2.50.0-rc0~173
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=52241c96c7514b837233336033b8edc20f8ea0e8;p=thirdparty%2Fgit.git

Merge branch 'en/merge-process-renames-crash-fix'

The merge-recursive and merge-ort machinery crashed in corner cases
when certain renames are involved.

* en/merge-process-renames-crash-fix:
  merge-ort: fix slightly overzealous assertion for rename-to-self
  t6423: add a testcase causing a failed assertion in process_renames
---

52241c96c7514b837233336033b8edc20f8ea0e8