]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 93a8570 68cce04)
Merge branch 'tc/merge-default-to-upstream-leakfix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 7 Aug 2026 21:48:00 +0000 (14:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 7 Aug 2026 21:48:01 +0000 (14:48 -0700)
commitaa2932aedde6b1fb40cdab6176f69ab9409bf2ae
tree25b55a278d194b61db3a8b216f7498f991399812tree | snapshot
parent93a85701abaa03790133c8a87529a726ae9bee36commit | diff
parent68cce04a028cac13fa1fd7a368801fac3d8b156bcommit | diff
Merge branch 'tc/merge-default-to-upstream-leakfix'

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.