]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5f21c5f 68cce04)
Merge branch 'tc/merge-default-to-upstream-leakfix' into jch
authorJunio C Hamano <gitster@pobox.com>
Fri, 31 Jul 2026 15:54:06 +0000 (08:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 31 Jul 2026 15:54:06 +0000 (08:54 -0700)
commit4fd39e89ea86730c7a0a23a5f01a4fbb0da573f6
tree2e2c8ee6af029964339e1d458b814a27263f0875tree | snapshot
parent5f21c5ff636c62da22961e23fc19289c3f7766ffcommit | diff
parent68cce04a028cac13fa1fd7a368801fac3d8b156bcommit | diff
Merge branch 'tc/merge-default-to-upstream-leakfix' into jch

A memory leak in 'git merge' when run without arguments (which
triggers the default-to-upstream path) has been fixed.  A test has
been added to cover this case.

* tc/merge-default-to-upstream-leakfix:
  merge: fix leak with merge.defaultToUpstream
builtin/merge.c diff1 | diff2 | blob | history
t/t7600-merge.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.