diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-10-25 17:11:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-25 17:11:34 -0700 |
| commit | bcf22f29df87f25582de0ac9274d1567fa16be6f (patch) | |
| tree | 170b4e950ba1b15dc3d7b48f13e75211167c7b8c /commit.c | |
| parent | Merge branch 'ja/rebase-i-avoid-amending-self' into maint-2.38 (diff) | |
| parent | merge-ort: return early when failing to write a blob (diff) | |
| download | git-bcf22f29df87f25582de0ac9274d1567fa16be6f.tar.gz git-bcf22f29df87f25582de0ac9274d1567fa16be6f.zip | |
Merge branch 'js/merge-ort-in-read-only-repo' into maint-2.38
In read-only repositories, "git merge-tree" tried to come up with a
merge result tree object, which it failed (which is not wrong) and
led to a segfault (which is bad), which has been corrected.
* js/merge-ort-in-read-only-repo:
merge-ort: return early when failing to write a blob
merge-ort: fix segmentation fault in read-only repositories
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions