From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 8 Jul 2025 22:49:19 +0000 (-0700)
Subject: Merge branch 'kn/fetch-push-bulk-ref-update'
X-Git-Tag: v2.51.0-rc0~86
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=cdb787224707ddd2601fde0d89701d875310a457;p=thirdparty%2Fgit.git

Merge branch 'kn/fetch-push-bulk-ref-update'

"git push" and "git fetch" are taught to update refs in batches to
gain performance.

* kn/fetch-push-bulk-ref-update:
  receive-pack: handle reference deletions separately
  refs/files: skip updates with errors in batched updates
  receive-pack: use batched reference updates
  send-pack: fix memory leak around duplicate refs
  fetch: use batched reference updates
  refs: add function to translate errors to strings
---

cdb787224707ddd2601fde0d89701d875310a457
diff --cc t/t5516-fetch-push.sh
index 782f5f93ea,1649667441..4e9c27b0f2
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@@ -1909,14 -1909,13 +1909,23 @@@ test_expect_success 'push with config p
  		--thin --delta-base-offset -q --no-use-bitmap-index <false
  '
  
 +test_expect_success 'push with config pack.usePathWalk=true' '
 +	mk_test testrepo heads/main &&
 +	git checkout main &&
 +	test_config pack.usePathWalk true &&
 +	GIT_TRACE2_EVENT="$(pwd)/path-walk.txt" \
 +	git push --quiet testrepo main:test &&
 +
 +	test_region pack-objects path-walk path-walk.txt
 +'
 +
+ test_expect_success 'push with F/D conflict with deletion and creation' '
+ 	test_when_finished "git branch -D branch" &&
+ 	git branch branch/conflict &&
+ 	mk_test testrepo heads/branch/conflict &&
+ 	git branch -D branch/conflict &&
+ 	git branch branch &&
+ 	git push testrepo :refs/heads/branch/conflict refs/heads/branch
+ '
+ 
  test_done