]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.