diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-10-10 10:08:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-10 10:08:43 -0700 |
| commit | 19118cb8570e499e1a56e81740cee3d1c1206b44 (patch) | |
| tree | 8fbb76fb37f4d45e5e979c92a0cf5402aa182426 /contrib/persistent-https | |
| parent | a215853545209b2e82a49c3fc538b9aad204d274 (diff) | |
| parent | 92481d1b26ab57525f5efe01d01c7a3d337b8df7 (diff) | |
| download | git-19118cb8570e499e1a56e81740cee3d1c1206b44.tar.gz git-19118cb8570e499e1a56e81740cee3d1c1206b44.zip | |
Merge branch 'js/merge-ort-in-read-only-repo'
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 'contrib/persistent-https')
0 files changed, 0 insertions, 0 deletions