]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1a764cd 3adba40)
Merge branch 'en/merge-process-renames-crash-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Mar 2025 07:26:10 +0000 (16:26 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Mar 2025 07:26:11 +0000 (16:26 +0900)
commit52241c96c7514b837233336033b8edc20f8ea0e8
tree4793a79217697ef05544108934b3d85a887438dftree | snapshot
parent1a764cdbdcaba4e9b1d4d5d00b51716977178392commit | diff
parent3adba40858036a5a44f550aaab5287ad135f5f87commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.