merge-ort: fix a crash in process_renames for a file transitively renamed to itself
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest2 patches 8 repliesIn review
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/2 | t6423: add a testcase causing a failed assertion in process_renamest/ | +41 | 0 replies | |
| 2/2 | merge-ort: fix slightly overzealous assertion for rename-to-selfmerge-ort.c t/ | +3 | 8 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.
Cover letter [PATCH 0/2] merge-ort: fix a crash in process_renames for a file transitively renamed to itself
Maintainer note: this is not a recent regression; it need not be included in v2.49.0.
This is a follow-up to Dmitry's report of a case where both merge-ort and merge-recursive fail to properly handle a very specific type of conflict. See
https://lore.kernel.org/git/[email protected]/
for the earlier thread; the first patch is an adaptation of his demonstrating the issue, and the second patch is my fix for it.
Dmitry Goncharov (1):
t6423: add a testcase causing a failed assertion in process_renames
Elijah Newren (1):
merge-ort: fix slightly overzealous assertion for rename-to-self
merge-ort.c | 3 ++- t/t6423-merge-rename-directories.sh | 41 +++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-)
base-commit: f93ff170b93a1782659637824b25923245ac9dd1
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1873%2Fnewren%2Fendit-fix-funny-rename-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1873/newren/endit-fix-funny-rename-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1873
Signature · 1 line
gitgitgadget