]> git.ipfire.org Git - thirdparty/git.git/commit - po/es.po
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7f8a6ca 92481d1)
Merge branch 'js/merge-ort-in-read-only-repo' into maint-2.38
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2022 00:11:34 +0000 (17:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2022 00:11:34 +0000 (17:11 -0700)
commitbcf22f29df87f25582de0ac9274d1567fa16be6f
tree170b4e950ba1b15dc3d7b48f13e75211167c7b8ctree | snapshot
parent7f8a6caee563de5b1df31f698dfbe4b55a6b2beacommit | diff
parent92481d1b26ab57525f5efe01d01c7a3d337b8df7commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.