]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a215853 92481d1)
Merge branch 'js/merge-ort-in-read-only-repo'
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Oct 2022 17:08:43 +0000 (10:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Oct 2022 17:08:43 +0000 (10:08 -0700)
commit19118cb8570e499e1a56e81740cee3d1c1206b44
tree8fbb76fb37f4d45e5e979c92a0cf5402aa182426tree | snapshot
parenta215853545209b2e82a49c3fc538b9aad204d274commit | diff
parent92481d1b26ab57525f5efe01d01c7a3d337b8df7commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.