From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 Jul 2026 17:40:44 +0000 (-0700)
Subject: Merge branch 'tc/merge-default-to-upstream-leakfix' into jch
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9fc80c98a0d9bebcc899731fb3230f6e25f90d63;p=thirdparty%2Fgit.git

Merge branch 'tc/merge-default-to-upstream-leakfix' into jch

Leakfix.

* tc/merge-default-to-upstream-leakfix:
  merge: fix leak with merge.defaultToUpstream
---

9fc80c98a0d9bebcc899731fb3230f6e25f90d63
diff --cc t/t7600-merge.sh
index 7f2a1db16d,b3a2164e08..e31d261f9d
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@@ -1163,7 -1162,24 +1163,24 @@@ test_expect_success 'merge suggests mat
  test_expect_success 'suggested names are not ambiguous' '
  	git update-ref refs/heads/origin/not-local HEAD &&
  	test_must_fail git merge not-local 2>stderr &&
 -	grep remotes/origin/not-local stderr
 +	test_grep remotes/origin/not-local stderr
  '
  
+ test_expect_success 'merge with no argument defaults to upstream' '
+ 	test_when_finished "rm -rf upstream downstream" &&
+ 	git init upstream &&
+ 	(
+ 		cd upstream &&
+ 		test_commit one &&
+ 		test_commit two
+ 	) &&
+ 	git clone upstream downstream &&
+ 	(
+ 		cd downstream &&
+ 		git reset --hard HEAD^ &&
+ 		git merge &&
+ 		test_cmp_rev origin/main HEAD
+ 	)
+ '
+ 
  test_done