Adding upstream version 1:2.39.2.upstream/1%2.39.2upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 1878 insertions, 0 deletions

diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
new file mode 100755
index 0000000..98a27a2
--- /dev/null
+++ b/t/t5516-fetch-push.sh
@@ -0,0 +1,1878 @@
+#!/bin/sh
+
+test_description='Basic fetch/push functionality.
+
+This test checks the following functionality:
+
+* command-line syntax
+* refspecs
+* fast-forward detection, and overriding it
+* configuration
+* hooks
+* --porcelain output format
+* hiderefs
+* reflogs
+* URL validation
+'
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+TEST_CREATE_REPO_NO_TEMPLATE=1
+. ./test-lib.sh
+
+D=$(pwd)
+
+mk_empty () {
+	repo_name="$1"
+	test_when_finished "rm -rf \"$repo_name\"" &&
+	test_path_is_missing "$repo_name" &&
+	git init --template= "$repo_name" &&
+	mkdir "$repo_name"/.git/hooks &&
+	git -C "$repo_name" config receive.denyCurrentBranch warn
+}
+
+mk_test () {
+	repo_name="$1"
+	shift
+
+	mk_empty "$repo_name" &&
+	(
+		for ref in "$@"
+		do
+			git push "$repo_name" $the_first_commit:refs/$ref ||
+			exit
+		done &&
+		cd "$repo_name" &&
+		for ref in "$@"
+		do
+			echo "$the_first_commit" >expect &&
+			git show-ref -s --verify refs/$ref >actual &&
+			test_cmp expect actual ||
+			exit
+		done &&
+		git fsck --full
+	)
+}
+
+mk_test_with_hooks() {
+	repo_name=$1
+	mk_test "$@" &&
+	test_hook -C "$repo_name" pre-receive <<-'EOF' &&
+	cat - >>pre-receive.actual
+	EOF
+
+	test_hook -C "$repo_name" update <<-'EOF' &&
+	printf "%s %s %s\n" "$@" >>update.actual
+	EOF
+
+	test_hook -C "$repo_name" post-receive <<-'EOF' &&
+	cat - >>post-receive.actual
+	EOF
+
+	test_hook -C "$repo_name" post-update <<-'EOF'
+	for ref in "$@"
+	do
+		printf "%s\n" "$ref" >>post-update.actual
+	done
+	EOF
+}
+
+mk_child() {
+	test_when_finished "rm -rf \"$2\"" &&
+	git clone --template= "$1" "$2"
+}
+
+check_push_result () {
+	test $# -ge 3 ||
+	BUG "check_push_result requires at least 3 parameters"
+
+	repo_name="$1"
+	shift
+
+	(
+		cd "$repo_name" &&
+		echo "$1" >expect &&
+		shift &&
+		for ref in "$@"
+		do
+			git show-ref -s --verify refs/$ref >actual &&
+			test_cmp expect actual ||
+			exit
+		done &&
+		git fsck --full
+	)
+}
+
+test_expect_success setup '
+
+	>path1 &&
+	git add path1 &&
+	test_tick &&
+	git commit -a -m repo &&
+	the_first_commit=$(git show-ref -s --verify refs/heads/main) &&
+
+	>path2 &&
+	git add path2 &&
+	test_tick &&
+	git commit -a -m second &&
+	the_commit=$(git show-ref -s --verify refs/heads/main)
+
+'
+
+test_expect_success 'fetch without wildcard' '
+	mk_empty testrepo &&
+	(
+		cd testrepo &&
+		git fetch .. refs/heads/main:refs/remotes/origin/main &&
+
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	)
+'
+
+test_expect_success 'fetch with wildcard' '
+	mk_empty testrepo &&
+	(
+		cd testrepo &&
+		git config remote.up.url .. &&
+		git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
+		git fetch up &&
+
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	)
+'
+
+test_expect_success 'fetch with insteadOf' '
+	mk_empty testrepo &&
+	(
+		TRASH=$(pwd)/ &&
+		cd testrepo &&
+		git config "url.$TRASH.insteadOf" trash/ &&
+		git config remote.up.url trash/. &&
+		git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
+		git fetch up &&
+
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	)
+'
+
+test_expect_success 'fetch with pushInsteadOf (should not rewrite)' '
+	mk_empty testrepo &&
+	(
+		TRASH=$(pwd)/ &&
+		cd testrepo &&
+		git config "url.trash/.pushInsteadOf" "$TRASH" &&
+		git config remote.up.url "$TRASH." &&
+		git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
+		git fetch up &&
+
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	)
+'
+
+grep_wrote () {
+	object_count=$1
+	file_name=$2
+	grep 'write_pack_file/wrote.*"value":"'$1'"' $2
+}
+
+test_expect_success 'push without negotiation' '
+	mk_empty testrepo &&
+	git push testrepo $the_first_commit:refs/remotes/origin/first_commit &&
+	test_commit -C testrepo unrelated_commit &&
+	git -C testrepo config receive.hideRefs refs/remotes/origin/first_commit &&
+	test_when_finished "rm event" &&
+	GIT_TRACE2_EVENT="$(pwd)/event" git -c protocol.version=2 push testrepo refs/heads/main:refs/remotes/origin/main &&
+	grep_wrote 5 event # 2 commits, 2 trees, 1 blob
+'
+
+test_expect_success 'push with negotiation' '
+	mk_empty testrepo &&
+	git push testrepo $the_first_commit:refs/remotes/origin/first_commit &&
+	test_commit -C testrepo unrelated_commit &&
+	git -C testrepo config receive.hideRefs refs/remotes/origin/first_commit &&
+	test_when_finished "rm event" &&
+	GIT_TRACE2_EVENT="$(pwd)/event" \
+		git -c protocol.version=2 -c push.negotiate=1 \
+		push testrepo refs/heads/main:refs/remotes/origin/main &&
+	grep \"key\":\"total_rounds\",\"value\":\"1\" event &&
+	grep_wrote 2 event # 1 commit, 1 tree
+'
+
+test_expect_success 'push with negotiation proceeds anyway even if negotiation fails' '
+	mk_empty testrepo &&
+	git push testrepo $the_first_commit:refs/remotes/origin/first_commit &&
+	test_commit -C testrepo unrelated_commit &&
+	git -C testrepo config receive.hideRefs refs/remotes/origin/first_commit &&
+	test_when_finished "rm event" &&
+	GIT_TEST_PROTOCOL_VERSION=0 GIT_TRACE2_EVENT="$(pwd)/event" \
+		git -c push.negotiate=1 push testrepo refs/heads/main:refs/remotes/origin/main 2>err &&
+	grep_wrote 5 event && # 2 commits, 2 trees, 1 blob
+	test_i18ngrep "push negotiation failed" err
+'
+
+test_expect_success 'push with negotiation does not attempt to fetch submodules' '
+	mk_empty submodule_upstream &&
+	test_commit -C submodule_upstream submodule_commit &&
+	test_config_global protocol.file.allow always &&
+	git submodule add ./submodule_upstream submodule &&
+	mk_empty testrepo &&
+	git push testrepo $the_first_commit:refs/remotes/origin/first_commit &&
+	test_commit -C testrepo unrelated_commit &&
+	git -C testrepo config receive.hideRefs refs/remotes/origin/first_commit &&
+	GIT_TRACE2_EVENT="$(pwd)/event"  git -c submodule.recurse=true \
+		-c protocol.version=2 -c push.negotiate=1 \
+		push testrepo refs/heads/main:refs/remotes/origin/main 2>err &&
+	grep \"key\":\"total_rounds\",\"value\":\"1\" event &&
+	! grep "Fetching submodule" err
+'
+
+test_expect_success 'push without wildcard' '
+	mk_empty testrepo &&
+
+	git push testrepo refs/heads/main:refs/remotes/origin/main &&
+	(
+		cd testrepo &&
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	)
+'
+
+test_expect_success 'push with wildcard' '
+	mk_empty testrepo &&
+
+	git push testrepo "refs/heads/*:refs/remotes/origin/*" &&
+	(
+		cd testrepo &&
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	)
+'
+
+test_expect_success 'push with insteadOf' '
+	mk_empty testrepo &&
+	TRASH="$(pwd)/" &&
+	test_config "url.$TRASH.insteadOf" trash/ &&
+	git push trash/testrepo refs/heads/main:refs/remotes/origin/main &&
+	(
+		cd testrepo &&
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	)
+'
+
+test_expect_success 'push with pushInsteadOf' '
+	mk_empty testrepo &&
+	TRASH="$(pwd)/" &&
+	test_config "url.$TRASH.pushInsteadOf" trash/ &&
+	git push trash/testrepo refs/heads/main:refs/remotes/origin/main &&
+	(
+		cd testrepo &&
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	)
+'
+
+test_expect_success 'push with pushInsteadOf and explicit pushurl (pushInsteadOf should not rewrite)' '
+	mk_empty testrepo &&
+	test_config "url.trash2/.pushInsteadOf" testrepo/ &&
+	test_config "url.trash3/.pushInsteadOf" trash/wrong &&
+	test_config remote.r.url trash/wrong &&
+	test_config remote.r.pushurl "testrepo/" &&
+	git push r refs/heads/main:refs/remotes/origin/main &&
+	(
+		cd testrepo &&
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	)
+'
+
+test_expect_success 'push with matching heads' '
+
+	mk_test testrepo heads/main &&
+	git push testrepo : &&
+	check_push_result testrepo $the_commit heads/main
+
+'
+
+test_expect_success 'push with matching heads on the command line' '
+
+	mk_test testrepo heads/main &&
+	git push testrepo : &&
+	check_push_result testrepo $the_commit heads/main
+
+'
+
+test_expect_success 'failed (non-fast-forward) push with matching heads' '
+
+	mk_test testrepo heads/main &&
+	git push testrepo : &&
+	git commit --amend -massaged &&
+	test_must_fail git push testrepo &&
+	check_push_result testrepo $the_commit heads/main &&
+	git reset --hard $the_commit
+
+'
+
+test_expect_success 'push --force with matching heads' '
+
+	mk_test testrepo heads/main &&
+	git push testrepo : &&
+	git commit --amend -massaged &&
+	git push --force testrepo : &&
+	! check_push_result testrepo $the_commit heads/main &&
+	git reset --hard $the_commit
+
+'
+
+test_expect_success 'push with matching heads and forced update' '
+
+	mk_test testrepo heads/main &&
+	git push testrepo : &&
+	git commit --amend -massaged &&
+	git push testrepo +: &&
+	! check_push_result testrepo $the_commit heads/main &&
+	git reset --hard $the_commit
+
+'
+
+test_expect_success 'push with no ambiguity (1)' '
+
+	mk_test testrepo heads/main &&
+	git push testrepo main:main &&
+	check_push_result testrepo $the_commit heads/main
+
+'
+
+test_expect_success 'push with no ambiguity (2)' '
+
+	mk_test testrepo remotes/origin/main &&
+	git push testrepo main:origin/main &&
+	check_push_result testrepo $the_commit remotes/origin/main
+
+'
+
+test_expect_success 'push with colon-less refspec, no ambiguity' '
+
+	mk_test testrepo heads/main heads/t/main &&
+	git branch -f t/main main &&
+	git push testrepo main &&
+	check_push_result testrepo $the_commit heads/main &&
+	check_push_result testrepo $the_first_commit heads/t/main
+
+'
+
+test_expect_success 'push with weak ambiguity (1)' '
+
+	mk_test testrepo heads/main remotes/origin/main &&
+	git push testrepo main:main &&
+	check_push_result testrepo $the_commit heads/main &&
+	check_push_result testrepo $the_first_commit remotes/origin/main
+
+'
+
+test_expect_success 'push with weak ambiguity (2)' '
+
+	mk_test testrepo heads/main remotes/origin/main remotes/another/main &&
+	git push testrepo main:main &&
+	check_push_result testrepo $the_commit heads/main &&
+	check_push_result testrepo $the_first_commit remotes/origin/main remotes/another/main
+
+'
+
+test_expect_success 'push with ambiguity' '
+
+	mk_test testrepo heads/frotz tags/frotz &&
+	test_must_fail git push testrepo main:frotz &&
+	check_push_result testrepo $the_first_commit heads/frotz tags/frotz
+
+'
+
+test_expect_success 'push with colon-less refspec (1)' '
+
+	mk_test testrepo heads/frotz tags/frotz &&
+	git branch -f frotz main &&
+	git push testrepo frotz &&
+	check_push_result testrepo $the_commit heads/frotz &&
+	check_push_result testrepo $the_first_commit tags/frotz
+
+'
+
+test_expect_success 'push with colon-less refspec (2)' '
+
+	mk_test testrepo heads/frotz tags/frotz &&
+	if git show-ref --verify -q refs/heads/frotz
+	then
+		git branch -D frotz
+	fi &&
+	git tag -f frotz &&
+	git push -f testrepo frotz &&
+	check_push_result testrepo $the_commit tags/frotz &&
+	check_push_result testrepo $the_first_commit heads/frotz
+
+'
+
+test_expect_success 'push with colon-less refspec (3)' '
+
+	mk_test testrepo &&
+	if git show-ref --verify -q refs/tags/frotz
+	then
+		git tag -d frotz
+	fi &&
+	git branch -f frotz main &&
+	git push testrepo frotz &&
+	check_push_result testrepo $the_commit heads/frotz &&
+	test 1 = $( cd testrepo && git show-ref | wc -l )
+'
+
+test_expect_success 'push with colon-less refspec (4)' '
+
+	mk_test testrepo &&
+	if git show-ref --verify -q refs/heads/frotz
+	then
+		git branch -D frotz
+	fi &&
+	git tag -f frotz &&
+	git push testrepo frotz &&
+	check_push_result testrepo $the_commit tags/frotz &&
+	test 1 = $( cd testrepo && git show-ref | wc -l )
+
+'
+
+test_expect_success 'push head with non-existent, incomplete dest' '
+
+	mk_test testrepo &&
+	git push testrepo main:branch &&
+	check_push_result testrepo $the_commit heads/branch
+
+'
+
+test_expect_success 'push tag with non-existent, incomplete dest' '
+
+	mk_test testrepo &&
+	git tag -f v1.0 &&
+	git push testrepo v1.0:tag &&
+	check_push_result testrepo $the_commit tags/tag
+
+'
+
+test_expect_success 'push sha1 with non-existent, incomplete dest' '
+
+	mk_test testrepo &&
+	test_must_fail git push testrepo $(git rev-parse main):foo
+
+'
+
+test_expect_success 'push ref expression with non-existent, incomplete dest' '
+
+	mk_test testrepo &&
+	test_must_fail git push testrepo main^:branch
+
+'
+
+for head in HEAD @
+do
+
+	test_expect_success "push with $head" '
+		mk_test testrepo heads/main &&
+		git checkout main &&
+		git push testrepo $head &&
+		check_push_result testrepo $the_commit heads/main
+	'
+
+	test_expect_success "push with $head nonexisting at remote" '
+		mk_test testrepo heads/main &&
+		git checkout -b local main &&
+		test_when_finished "git checkout main; git branch -D local" &&
+		git push testrepo $head &&
+		check_push_result testrepo $the_commit heads/local
+	'
+
+	test_expect_success "push with +$head" '
+		mk_test testrepo heads/main &&
+		git checkout -b local main &&
+		test_when_finished "git checkout main; git branch -D local" &&
+		git push testrepo main local &&
+		check_push_result testrepo $the_commit heads/main &&
+		check_push_result testrepo $the_commit heads/local &&
+
+		# Without force rewinding should fail
+		git reset --hard $head^ &&
+		test_must_fail git push testrepo $head &&
+		check_push_result testrepo $the_commit heads/local &&
+
+		# With force rewinding should succeed
+		git push testrepo +$head &&
+		check_push_result testrepo $the_first_commit heads/local
+	'
+
+	test_expect_success "push $head with non-existent, incomplete dest" '
+		mk_test testrepo &&
+		git checkout main &&
+		git push testrepo $head:branch &&
+		check_push_result testrepo $the_commit heads/branch
+
+	'
+
+	test_expect_success "push with config remote.*.push = $head" '
+		mk_test testrepo heads/local &&
+		git checkout main &&
+		git branch -f local $the_commit &&
+		test_when_finished "git branch -D local" &&
+		(
+			cd testrepo &&
+			git checkout local &&
+			git reset --hard $the_first_commit
+		) &&
+		test_config remote.there.url testrepo &&
+		test_config remote.there.push $head &&
+		test_config branch.main.remote there &&
+		git push &&
+		check_push_result testrepo $the_commit heads/main &&
+		check_push_result testrepo $the_first_commit heads/local
+	'
+
+done
+
+test_expect_success "push to remote with no explicit refspec and config remote.*.push = src:dest" '
+	mk_test testrepo heads/main &&
+	git checkout $the_first_commit &&
+	test_config remote.there.url testrepo &&
+	test_config remote.there.push refs/heads/main:refs/heads/main &&
+	git push there &&
+	check_push_result testrepo $the_commit heads/main
+'
+
+test_expect_success 'push with remote.pushdefault' '
+	mk_test up_repo heads/main &&
+	mk_test down_repo heads/main &&
+	test_config remote.up.url up_repo &&
+	test_config remote.down.url down_repo &&
+	test_config branch.main.remote up &&
+	test_config remote.pushdefault down &&
+	test_config push.default matching &&
+	git push &&
+	check_push_result up_repo $the_first_commit heads/main &&
+	check_push_result down_repo $the_commit heads/main
+'
+
+test_expect_success 'push with config remote.*.pushurl' '
+
+	mk_test testrepo heads/main &&
+	git checkout main &&
+	test_config remote.there.url test2repo &&
+	test_config remote.there.pushurl testrepo &&
+	git push there : &&
+	check_push_result testrepo $the_commit heads/main
+'
+
+test_expect_success 'push with config branch.*.pushremote' '
+	mk_test up_repo heads/main &&
+	mk_test side_repo heads/main &&
+	mk_test down_repo heads/main &&
+	test_config remote.up.url up_repo &&
+	test_config remote.pushdefault side_repo &&
+	test_config remote.down.url down_repo &&
+	test_config branch.main.remote up &&
+	test_config branch.main.pushremote down &&
+	test_config push.default matching &&
+	git push &&
+	check_push_result up_repo $the_first_commit heads/main &&
+	check_push_result side_repo $the_first_commit heads/main &&
+	check_push_result down_repo $the_commit heads/main
+'
+
+test_expect_success 'branch.*.pushremote config order is irrelevant' '
+	mk_test one_repo heads/main &&
+	mk_test two_repo heads/main &&
+	test_config remote.one.url one_repo &&
+	test_config remote.two.url two_repo &&
+	test_config branch.main.pushremote two_repo &&
+	test_config remote.pushdefault one_repo &&
+	test_config push.default matching &&
+	git push &&
+	check_push_result one_repo $the_first_commit heads/main &&
+	check_push_result two_repo $the_commit heads/main
+'
+
+test_expect_success 'push rejects empty branch name entries' '
+	mk_test one_repo heads/main &&
+	test_config remote.one.url one_repo &&
+	test_config branch..remote one &&
+	test_config branch..merge refs/heads/ &&
+	test_config branch.main.remote one &&
+	test_config branch.main.merge refs/heads/main &&
+	test_must_fail git push 2>err &&
+	grep "bad config variable .branch\.\." err
+'
+
+test_expect_success 'push ignores "branch." config without subsection' '
+	mk_test one_repo heads/main &&
+	test_config remote.one.url one_repo &&
+	test_config branch.autoSetupMerge true &&
+	test_config branch.main.remote one &&
+	test_config branch.main.merge refs/heads/main &&
+	git push
+'
+
+test_expect_success 'push with dry-run' '
+
+	mk_test testrepo heads/main &&
+	old_commit=$(git -C testrepo show-ref -s --verify refs/heads/main) &&
+	git push --dry-run testrepo : &&
+	check_push_result testrepo $old_commit heads/main
+'
+
+test_expect_success 'push updates local refs' '
+
+	mk_test testrepo heads/main &&
+	mk_child testrepo child &&
+	(
+		cd child &&
+		git pull .. main &&
+		git push &&
+		test $(git rev-parse main) = \
+			$(git rev-parse remotes/origin/main)
+	)
+
+'
+
+test_expect_success 'push updates up-to-date local refs' '
+
+	mk_test testrepo heads/main &&
+	mk_child testrepo child1 &&
+	mk_child testrepo child2 &&
+	(cd child1 && git pull .. main && git push) &&
+	(
+		cd child2 &&
+		git pull ../child1 main &&
+		git push &&
+		test $(git rev-parse main) = \
+			$(git rev-parse remotes/origin/main)
+	)
+
+'
+
+test_expect_success 'push preserves up-to-date packed refs' '
+
+	mk_test testrepo heads/main &&
+	mk_child testrepo child &&
+	(
+		cd child &&
+		git push &&
+		! test -f .git/refs/remotes/origin/main
+	)
+
+'
+
+test_expect_success 'push does not update local refs on failure' '
+
+	mk_test testrepo heads/main &&
+	mk_child testrepo child &&
+	echo "#!/no/frobnication/today" >testrepo/.git/hooks/pre-receive &&
+	chmod +x testrepo/.git/hooks/pre-receive &&
+	(
+		cd child &&
+		git pull .. main &&
+		test_must_fail git push &&
+		test $(git rev-parse main) != \
+			$(git rev-parse remotes/origin/main)
+	)
+
+'
+
+test_expect_success 'allow deleting an invalid remote ref' '
+
+	mk_test testrepo heads/branch &&
+	rm -f testrepo/.git/objects/??/* &&
+	git push testrepo :refs/heads/branch &&
+	(cd testrepo && test_must_fail git rev-parse --verify refs/heads/branch)
+
+'
+
+test_expect_success 'pushing valid refs triggers post-receive and post-update hooks' '
+	mk_test_with_hooks testrepo heads/main heads/next &&
+	orgmain=$(cd testrepo && git show-ref -s --verify refs/heads/main) &&
+	newmain=$(git show-ref -s --verify refs/heads/main) &&
+	orgnext=$(cd testrepo && git show-ref -s --verify refs/heads/next) &&
+	newnext=$ZERO_OID &&
+	git push testrepo refs/heads/main:refs/heads/main :refs/heads/next &&
+	(
+		cd testrepo/.git &&
+		cat >pre-receive.expect <<-EOF &&
+		$orgmain $newmain refs/heads/main
+		$orgnext $newnext refs/heads/next
+		EOF
+
+		cat >update.expect <<-EOF &&
+		refs/heads/main $orgmain $newmain
+		refs/heads/next $orgnext $newnext
+		EOF
+
+		cat >post-receive.expect <<-EOF &&
+		$orgmain $newmain refs/heads/main
+		$orgnext $newnext refs/heads/next
+		EOF
+
+		cat >post-update.expect <<-EOF &&
+		refs/heads/main
+		refs/heads/next
+		EOF
+
+		test_cmp pre-receive.expect pre-receive.actual &&
+		test_cmp update.expect update.actual &&
+		test_cmp post-receive.expect post-receive.actual &&
+		test_cmp post-update.expect post-update.actual
+	)
+'
+
+test_expect_success 'deleting dangling ref triggers hooks with correct args' '
+	mk_test_with_hooks testrepo heads/branch &&
+	orig=$(git -C testrepo rev-parse refs/heads/branch) &&
+	rm -f testrepo/.git/objects/??/* &&
+	git push testrepo :refs/heads/branch &&
+	(
+		cd testrepo/.git &&
+		cat >pre-receive.expect <<-EOF &&
+		$orig $ZERO_OID refs/heads/branch
+		EOF
+
+		cat >update.expect <<-EOF &&
+		refs/heads/branch $orig $ZERO_OID
+		EOF
+
+		cat >post-receive.expect <<-EOF &&
+		$orig $ZERO_OID refs/heads/branch
+		EOF
+
+		cat >post-update.expect <<-EOF &&
+		refs/heads/branch
+		EOF
+
+		test_cmp pre-receive.expect pre-receive.actual &&
+		test_cmp update.expect update.actual &&
+		test_cmp post-receive.expect post-receive.actual &&
+		test_cmp post-update.expect post-update.actual
+	)
+'
+
+test_expect_success 'deletion of a non-existent ref is not fed to post-receive and post-update hooks' '
+	mk_test_with_hooks testrepo heads/main &&
+	orgmain=$(cd testrepo && git show-ref -s --verify refs/heads/main) &&
+	newmain=$(git show-ref -s --verify refs/heads/main) &&
+	git push testrepo main :refs/heads/nonexistent &&
+	(
+		cd testrepo/.git &&
+		cat >pre-receive.expect <<-EOF &&
+		$orgmain $newmain refs/heads/main
+		$ZERO_OID $ZERO_OID refs/heads/nonexistent
+		EOF
+
+		cat >update.expect <<-EOF &&
+		refs/heads/main $orgmain $newmain
+		refs/heads/nonexistent $ZERO_OID $ZERO_OID
+		EOF
+
+		cat >post-receive.expect <<-EOF &&
+		$orgmain $newmain refs/heads/main
+		EOF
+
+		cat >post-update.expect <<-EOF &&
+		refs/heads/main
+		EOF
+
+		test_cmp pre-receive.expect pre-receive.actual &&
+		test_cmp update.expect update.actual &&
+		test_cmp post-receive.expect post-receive.actual &&
+		test_cmp post-update.expect post-update.actual
+	)
+'
+
+test_expect_success 'deletion of a non-existent ref alone does trigger post-receive and post-update hooks' '
+	mk_test_with_hooks testrepo heads/main &&
+	git push testrepo :refs/heads/nonexistent &&
+	(
+		cd testrepo/.git &&
+		cat >pre-receive.expect <<-EOF &&
+		$ZERO_OID $ZERO_OID refs/heads/nonexistent
+		EOF
+
+		cat >update.expect <<-EOF &&
+		refs/heads/nonexistent $ZERO_OID $ZERO_OID
+		EOF
+
+		test_cmp pre-receive.expect pre-receive.actual &&
+		test_cmp update.expect update.actual &&
+		test_path_is_missing post-receive.actual &&
+		test_path_is_missing post-update.actual
+	)
+'
+
+test_expect_success 'mixed ref updates, deletes, invalid deletes trigger hooks with correct input' '
+	mk_test_with_hooks testrepo heads/main heads/next heads/seen &&
+	orgmain=$(cd testrepo && git show-ref -s --verify refs/heads/main) &&
+	newmain=$(git show-ref -s --verify refs/heads/main) &&
+	orgnext=$(cd testrepo && git show-ref -s --verify refs/heads/next) &&
+	newnext=$ZERO_OID &&
+	orgseen=$(cd testrepo && git show-ref -s --verify refs/heads/seen) &&
+	newseen=$(git show-ref -s --verify refs/heads/main) &&
+	git push testrepo refs/heads/main:refs/heads/main \
+	    refs/heads/main:refs/heads/seen :refs/heads/next \
+	    :refs/heads/nonexistent &&
+	(
+		cd testrepo/.git &&
+		cat >pre-receive.expect <<-EOF &&
+		$orgmain $newmain refs/heads/main
+		$orgnext $newnext refs/heads/next
+		$orgseen $newseen refs/heads/seen
+		$ZERO_OID $ZERO_OID refs/heads/nonexistent
+		EOF
+
+		cat >update.expect <<-EOF &&
+		refs/heads/main $orgmain $newmain
+		refs/heads/next $orgnext $newnext
+		refs/heads/seen $orgseen $newseen
+		refs/heads/nonexistent $ZERO_OID $ZERO_OID
+		EOF
+
+		cat >post-receive.expect <<-EOF &&
+		$orgmain $newmain refs/heads/main
+		$orgnext $newnext refs/heads/next
+		$orgseen $newseen refs/heads/seen
+		EOF
+
+		cat >post-update.expect <<-EOF &&
+		refs/heads/main
+		refs/heads/next
+		refs/heads/seen
+		EOF
+
+		test_cmp pre-receive.expect pre-receive.actual &&
+		test_cmp update.expect update.actual &&
+		test_cmp post-receive.expect post-receive.actual &&
+		test_cmp post-update.expect post-update.actual
+	)
+'
+
+test_expect_success 'allow deleting a ref using --delete' '
+	mk_test testrepo heads/main &&
+	(cd testrepo && git config receive.denyDeleteCurrent warn) &&
+	git push testrepo --delete main &&
+	(cd testrepo && test_must_fail git rev-parse --verify refs/heads/main)
+'
+
+test_expect_success 'allow deleting a tag using --delete' '
+	mk_test testrepo heads/main &&
+	git tag -a -m dummy_message deltag heads/main &&
+	git push testrepo --tags &&
+	(cd testrepo && git rev-parse --verify -q refs/tags/deltag) &&
+	git push testrepo --delete tag deltag &&
+	(cd testrepo && test_must_fail git rev-parse --verify refs/tags/deltag)
+'
+
+test_expect_success 'push --delete without args aborts' '
+	mk_test testrepo heads/main &&
+	test_must_fail git push testrepo --delete
+'
+
+test_expect_success 'push --delete refuses src:dest refspecs' '
+	mk_test testrepo heads/main &&
+	test_must_fail git push testrepo --delete main:foo
+'
+
+test_expect_success 'push --delete refuses empty string' '
+	mk_test testrepo heads/master &&
+	test_must_fail git push testrepo --delete ""
+'
+
+test_expect_success 'warn on push to HEAD of non-bare repository' '
+	mk_test testrepo heads/main &&
+	(
+		cd testrepo &&
+		git checkout main &&
+		git config receive.denyCurrentBranch warn
+	) &&
+	git push testrepo main 2>stderr &&
+	grep "warning: updating the current branch" stderr
+'
+
+test_expect_success 'deny push to HEAD of non-bare repository' '
+	mk_test testrepo heads/main &&
+	(
+		cd testrepo &&
+		git checkout main &&
+		git config receive.denyCurrentBranch true
+	) &&
+	test_must_fail git push testrepo main
+'
+
+test_expect_success 'allow push to HEAD of bare repository (bare)' '
+	mk_test testrepo heads/main &&
+	(
+		cd testrepo &&
+		git checkout main &&
+		git config receive.denyCurrentBranch true &&
+		git config core.bare true
+	) &&
+	git push testrepo main 2>stderr &&
+	! grep "warning: updating the current branch" stderr
+'
+
+test_expect_success 'allow push to HEAD of non-bare repository (config)' '
+	mk_test testrepo heads/main &&
+	(
+		cd testrepo &&
+		git checkout main &&
+		git config receive.denyCurrentBranch false
+	) &&
+	git push testrepo main 2>stderr &&
+	! grep "warning: updating the current branch" stderr
+'
+
+test_expect_success 'fetch with branches' '
+	mk_empty testrepo &&
+	git branch second $the_first_commit &&
+	git checkout second &&
+	mkdir testrepo/.git/branches &&
+	echo ".." > testrepo/.git/branches/branch1 &&
+	(
+		cd testrepo &&
+		git fetch branch1 &&
+		echo "$the_commit commit	refs/heads/branch1" >expect &&
+		git for-each-ref refs/heads >actual &&
+		test_cmp expect actual
+	) &&
+	git checkout main
+'
+
+test_expect_success 'fetch with branches containing #' '
+	mk_empty testrepo &&
+	mkdir testrepo/.git/branches &&
+	echo "..#second" > testrepo/.git/branches/branch2 &&
+	(
+		cd testrepo &&
+		git fetch branch2 &&
+		echo "$the_first_commit commit	refs/heads/branch2" >expect &&
+		git for-each-ref refs/heads >actual &&
+		test_cmp expect actual
+	) &&
+	git checkout main
+'
+
+test_expect_success 'push with branches' '
+	mk_empty testrepo &&
+	git checkout second &&
+
+	test_when_finished "rm -rf .git/branches" &&
+	mkdir .git/branches &&
+	echo "testrepo" > .git/branches/branch1 &&
+
+	git push branch1 &&
+	(
+		cd testrepo &&
+		echo "$the_first_commit commit	refs/heads/main" >expect &&
+		git for-each-ref refs/heads >actual &&
+		test_cmp expect actual
+	)
+'
+
+test_expect_success 'push with branches containing #' '
+	mk_empty testrepo &&
+
+	test_when_finished "rm -rf .git/branches" &&
+	mkdir .git/branches &&
+	echo "testrepo#branch3" > .git/branches/branch2 &&
+
+	git push branch2 &&
+	(
+		cd testrepo &&
+		echo "$the_first_commit commit	refs/heads/branch3" >expect &&
+		git for-each-ref refs/heads >actual &&
+		test_cmp expect actual
+	) &&
+	git checkout main
+'
+
+test_expect_success 'push into aliased refs (consistent)' '
+	mk_test testrepo heads/main &&
+	mk_child testrepo child1 &&
+	mk_child testrepo child2 &&
+	(
+		cd child1 &&
+		git branch foo &&
+		git symbolic-ref refs/heads/bar refs/heads/foo &&
+		git config receive.denyCurrentBranch false
+	) &&
+	(
+		cd child2 &&
+		>path2 &&
+		git add path2 &&
+		test_tick &&
+		git commit -a -m child2 &&
+		git branch foo &&
+		git branch bar &&
+		git push ../child1 foo bar
+	)
+'
+
+test_expect_success 'push into aliased refs (inconsistent)' '
+	mk_test testrepo heads/main &&
+	mk_child testrepo child1 &&
+	mk_child testrepo child2 &&
+	(
+		cd child1 &&
+		git branch foo &&
+		git symbolic-ref refs/heads/bar refs/heads/foo &&
+		git config receive.denyCurrentBranch false
+	) &&
+	(
+		cd child2 &&
+		>path2 &&
+		git add path2 &&
+		test_tick &&
+		git commit -a -m child2 &&
+		git branch foo &&
+		>path3 &&
+		git add path3 &&
+		test_tick &&
+		git commit -a -m child2 &&
+		git branch bar &&
+		test_must_fail git push ../child1 foo bar 2>stderr &&
+		grep "refusing inconsistent update" stderr
+	)
+'
+
+test_force_push_tag () {
+	tag_type_description=$1
+	tag_args=$2
+
+	test_expect_success "force pushing required to update $tag_type_description" "
+		mk_test testrepo heads/main &&
+		mk_child testrepo child1 &&
+		mk_child testrepo child2 &&
+		(
+			cd child1 &&
+			git tag testTag &&
+			git push ../child2 testTag &&
+			>file1 &&
+			git add file1 &&
+			git commit -m 'file1' &&
+			git tag $tag_args testTag &&
+			test_must_fail git push ../child2 testTag &&
+			git push --force ../child2 testTag &&
+			git tag $tag_args testTag HEAD~ &&
+			test_must_fail git push ../child2 testTag &&
+			git push --force ../child2 testTag &&
+
+			# Clobbering without + in refspec needs --force
+			git tag -f testTag &&
+			test_must_fail git push ../child2 'refs/tags/*:refs/tags/*' &&
+			git push --force ../child2 'refs/tags/*:refs/tags/*' &&
+
+			# Clobbering with + in refspec does not need --force
+			git tag -f testTag HEAD~ &&
+			git push ../child2 '+refs/tags/*:refs/tags/*' &&
+
+			# Clobbering with --no-force still obeys + in refspec
+			git tag -f testTag &&
+			git push --no-force ../child2 '+refs/tags/*:refs/tags/*' &&
+
+			# Clobbering with/without --force and 'tag <name>' format
+			git tag -f testTag HEAD~ &&
+			test_must_fail git push ../child2 tag testTag &&
+			git push --force ../child2 tag testTag
+		)
+	"
+}
+
+test_force_push_tag "lightweight tag" "-f"
+test_force_push_tag "annotated tag" "-f -a -m'tag message'"
+
+test_force_fetch_tag () {
+	tag_type_description=$1
+	tag_args=$2
+
+	test_expect_success "fetch will not clobber an existing $tag_type_description without --force" "
+		mk_test testrepo heads/main &&
+		mk_child testrepo child1 &&
+		mk_child testrepo child2 &&
+		(
+			cd testrepo &&
+			git tag testTag &&
+			git -C ../child1 fetch origin tag testTag &&
+			>file1 &&
+			git add file1 &&
+			git commit -m 'file1' &&
+			git tag $tag_args testTag &&
+			test_must_fail git -C ../child1 fetch origin tag testTag &&
+			git -C ../child1 fetch origin '+refs/tags/*:refs/tags/*'
+		)
+	"
+}
+
+test_force_fetch_tag "lightweight tag" "-f"
+test_force_fetch_tag "annotated tag" "-f -a -m'tag message'"
+
+test_expect_success 'push --porcelain' '
+	mk_empty testrepo &&
+	echo >.git/foo  "To testrepo" &&
+	echo >>.git/foo "*	refs/heads/main:refs/remotes/origin/main	[new reference]"  &&
+	echo >>.git/foo "Done" &&
+	git push >.git/bar --porcelain  testrepo refs/heads/main:refs/remotes/origin/main &&
+	(
+		cd testrepo &&
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	) &&
+	test_cmp .git/foo .git/bar
+'
+
+test_expect_success 'push --porcelain bad url' '
+	mk_empty testrepo &&
+	test_must_fail git push >.git/bar --porcelain asdfasdfasd refs/heads/main:refs/remotes/origin/main &&
+	! grep -q Done .git/bar
+'
+
+test_expect_success 'push --porcelain rejected' '
+	mk_empty testrepo &&
+	git push testrepo refs/heads/main:refs/remotes/origin/main &&
+	(cd testrepo &&
+		git reset --hard origin/main^ &&
+		git config receive.denyCurrentBranch true) &&
+
+	echo >.git/foo  "To testrepo"  &&
+	echo >>.git/foo "!	refs/heads/main:refs/heads/main	[remote rejected] (branch is currently checked out)" &&
+	echo >>.git/foo "Done" &&
+
+	test_must_fail git push >.git/bar --porcelain  testrepo refs/heads/main:refs/heads/main &&
+	test_cmp .git/foo .git/bar
+'
+
+test_expect_success 'push --porcelain --dry-run rejected' '
+	mk_empty testrepo &&
+	git push testrepo refs/heads/main:refs/remotes/origin/main &&
+	(cd testrepo &&
+		git reset --hard origin/main &&
+		git config receive.denyCurrentBranch true) &&
+
+	echo >.git/foo  "To testrepo"  &&
+	echo >>.git/foo "!	refs/heads/main^:refs/heads/main	[rejected] (non-fast-forward)" &&
+	echo >>.git/foo "Done" &&
+
+	test_must_fail git push >.git/bar --porcelain  --dry-run testrepo refs/heads/main^:refs/heads/main &&
+	test_cmp .git/foo .git/bar
+'
+
+test_expect_success 'push --prune' '
+	mk_test testrepo heads/main heads/second heads/foo heads/bar &&
+	git push --prune testrepo : &&
+	check_push_result testrepo $the_commit heads/main &&
+	check_push_result testrepo $the_first_commit heads/second &&
+	! check_push_result testrepo $the_first_commit heads/foo heads/bar
+'
+
+test_expect_success 'push --prune refspec' '
+	mk_test testrepo tmp/main tmp/second tmp/foo tmp/bar &&
+	git push --prune testrepo "refs/heads/*:refs/tmp/*" &&
+	check_push_result testrepo $the_commit tmp/main &&
+	check_push_result testrepo $the_first_commit tmp/second &&
+	! check_push_result testrepo $the_first_commit tmp/foo tmp/bar
+'
+
+for configsection in transfer receive
+do
+	test_expect_success "push to update a ref hidden by $configsection.hiderefs" '
+		mk_test testrepo heads/main hidden/one hidden/two hidden/three &&
+		(
+			cd testrepo &&
+			git config $configsection.hiderefs refs/hidden
+		) &&
+
+		# push to unhidden ref succeeds normally
+		git push testrepo main:refs/heads/main &&
+		check_push_result testrepo $the_commit heads/main &&
+
+		# push to update a hidden ref should fail
+		test_must_fail git push testrepo main:refs/hidden/one &&
+		check_push_result testrepo $the_first_commit hidden/one &&
+
+		# push to delete a hidden ref should fail
+		test_must_fail git push testrepo :refs/hidden/two &&
+		check_push_result testrepo $the_first_commit hidden/two &&
+
+		# idempotent push to update a hidden ref should fail
+		test_must_fail git push testrepo $the_first_commit:refs/hidden/three &&
+		check_push_result testrepo $the_first_commit hidden/three
+	'
+done
+
+test_expect_success 'fetch exact SHA1' '
+	mk_test testrepo heads/main hidden/one &&
+	git push testrepo main:refs/hidden/one &&
+	(
+		cd testrepo &&
+		git config transfer.hiderefs refs/hidden
+	) &&
+	check_push_result testrepo $the_commit hidden/one &&
+
+	mk_child testrepo child &&
+	(
+		cd child &&
+
+		# make sure $the_commit does not exist here
+		git repack -a -d &&
+		git prune &&
+		test_must_fail git cat-file -t $the_commit &&
+
+		# Some protocol versions (e.g. 2) support fetching
+		# unadvertised objects, so restrict this test to v0.
+
+		# fetching the hidden object should fail by default
+		test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
+			git fetch -v ../testrepo $the_commit:refs/heads/copy 2>err &&
+		test_i18ngrep "Server does not allow request for unadvertised object" err &&
+		test_must_fail git rev-parse --verify refs/heads/copy &&
+
+		# the server side can allow it to succeed
+		(
+			cd ../testrepo &&
+			git config uploadpack.allowtipsha1inwant true
+		) &&
+
+		git fetch -v ../testrepo $the_commit:refs/heads/copy main:refs/heads/extra &&
+		cat >expect <<-EOF &&
+		$the_commit
+		$the_first_commit
+		EOF
+		{
+			git rev-parse --verify refs/heads/copy &&
+			git rev-parse --verify refs/heads/extra
+		} >actual &&
+		test_cmp expect actual
+	)
+'
+
+test_expect_success 'fetch exact SHA1 in protocol v2' '
+	mk_test testrepo heads/main hidden/one &&
+	git push testrepo main:refs/hidden/one &&
+	git -C testrepo config transfer.hiderefs refs/hidden &&
+	check_push_result testrepo $the_commit hidden/one &&
+
+	mk_child testrepo child &&
+	git -C child config protocol.version 2 &&
+
+	# make sure $the_commit does not exist here
+	git -C child repack -a -d &&
+	git -C child prune &&
+	test_must_fail git -C child cat-file -t $the_commit &&
+
+	# fetching the hidden object succeeds by default
+	# NEEDSWORK: should this match the v0 behavior instead?
+	git -C child fetch -v ../testrepo $the_commit:refs/heads/copy
+'
+
+for configallowtipsha1inwant in true false
+do
+	test_expect_success "shallow fetch reachable SHA1 (but not a ref), allowtipsha1inwant=$configallowtipsha1inwant" '
+		mk_empty testrepo &&
+		(
+			cd testrepo &&
+			git config uploadpack.allowtipsha1inwant $configallowtipsha1inwant &&
+			git commit --allow-empty -m foo &&
+			git commit --allow-empty -m bar
+		) &&
+		SHA1=$(git --git-dir=testrepo/.git rev-parse HEAD^) &&
+		mk_empty shallow &&
+		(
+			cd shallow &&
+			# Some protocol versions (e.g. 2) support fetching
+			# unadvertised objects, so restrict this test to v0.
+			test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
+				git fetch --depth=1 ../testrepo/.git $SHA1 &&
+			git --git-dir=../testrepo/.git config uploadpack.allowreachablesha1inwant true &&
+			git fetch --depth=1 ../testrepo/.git $SHA1 &&
+			git cat-file commit $SHA1
+		)
+	'
+
+	test_expect_success "deny fetch unreachable SHA1, allowtipsha1inwant=$configallowtipsha1inwant" '
+		mk_empty testrepo &&
+		(
+			cd testrepo &&
+			git config uploadpack.allowtipsha1inwant $configallowtipsha1inwant &&
+			git commit --allow-empty -m foo &&
+			git commit --allow-empty -m bar &&
+			git commit --allow-empty -m xyz
+		) &&
+		SHA1_1=$(git --git-dir=testrepo/.git rev-parse HEAD^^) &&
+		SHA1_2=$(git --git-dir=testrepo/.git rev-parse HEAD^) &&
+		SHA1_3=$(git --git-dir=testrepo/.git rev-parse HEAD) &&
+		(
+			cd testrepo &&
+			git reset --hard $SHA1_2 &&
+			git cat-file commit $SHA1_1 &&
+			git cat-file commit $SHA1_3
+		) &&
+		mk_empty shallow &&
+		(
+			cd shallow &&
+			# Some protocol versions (e.g. 2) support fetching
+			# unadvertised objects, so restrict this test to v0.
+			test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
+				git fetch ../testrepo/.git $SHA1_3 &&
+			test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
+				git fetch ../testrepo/.git $SHA1_1 &&
+			git --git-dir=../testrepo/.git config uploadpack.allowreachablesha1inwant true &&
+			git fetch ../testrepo/.git $SHA1_1 &&
+			git cat-file commit $SHA1_1 &&
+			test_must_fail git cat-file commit $SHA1_2 &&
+			git fetch ../testrepo/.git $SHA1_2 &&
+			git cat-file commit $SHA1_2 &&
+			test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
+				git fetch ../testrepo/.git $SHA1_3 2>err &&
+			# ideally we would insist this be on a "remote error:"
+			# line, but it is racy; see the commit message
+			test_i18ngrep "not our ref.*$SHA1_3\$" err
+		)
+	'
+done
+
+test_expect_success 'fetch follows tags by default' '
+	mk_test testrepo heads/main &&
+	test_when_finished "rm -rf src" &&
+	git init src &&
+	(
+		cd src &&
+		git pull ../testrepo main &&
+		git tag -m "annotated" tag &&
+		git for-each-ref >tmp1 &&
+		sed -n "p; s|refs/heads/main$|refs/remotes/origin/main|p" tmp1 |
+		sort -k 3 >../expect
+	) &&
+	test_when_finished "rm -rf dst" &&
+	git init dst &&
+	(
+		cd dst &&
+		git remote add origin ../src &&
+		git config branch.main.remote origin &&
+		git config branch.main.merge refs/heads/main &&
+		git pull &&
+		git for-each-ref >../actual
+	) &&
+	test_cmp expect actual
+'
+
+test_expect_success 'peeled advertisements are not considered ref tips' '
+	mk_empty testrepo &&
+	git -C testrepo commit --allow-empty -m one &&
+	git -C testrepo commit --allow-empty -m two &&
+	git -C testrepo tag -m foo mytag HEAD^ &&
+	oid=$(git -C testrepo rev-parse mytag^{commit}) &&
+	test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
+		git fetch testrepo $oid 2>err &&
+	test_i18ngrep "Server does not allow request for unadvertised object" err
+'
+
+test_expect_success 'pushing a specific ref applies remote.$name.push as refmap' '
+	mk_test testrepo heads/main &&
+	test_when_finished "rm -rf src" &&
+	git init src &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	(
+		cd src &&
+		git pull ../testrepo main &&
+		git branch next &&
+		git config remote.dst.url ../dst &&
+		git config remote.dst.push "+refs/heads/*:refs/remotes/src/*" &&
+		git push dst main &&
+		git show-ref refs/heads/main |
+		sed -e "s|refs/heads/|refs/remotes/src/|" >../dst/expect
+	) &&
+	(
+		cd dst &&
+		test_must_fail git show-ref refs/heads/next &&
+		test_must_fail git show-ref refs/heads/main &&
+		git show-ref refs/remotes/src/main >actual
+	) &&
+	test_cmp dst/expect dst/actual
+'
+
+test_expect_success 'with no remote.$name.push, it is not used as refmap' '
+	mk_test testrepo heads/main &&
+	test_when_finished "rm -rf src" &&
+	git init src &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	(
+		cd src &&
+		git pull ../testrepo main &&
+		git branch next &&
+		git config remote.dst.url ../dst &&
+		git config push.default matching &&
+		git push dst main &&
+		git show-ref refs/heads/main >../dst/expect
+	) &&
+	(
+		cd dst &&
+		test_must_fail git show-ref refs/heads/next &&
+		git show-ref refs/heads/main >actual
+	) &&
+	test_cmp dst/expect dst/actual
+'
+
+test_expect_success 'with no remote.$name.push, upstream mapping is used' '
+	mk_test testrepo heads/main &&
+	test_when_finished "rm -rf src" &&
+	git init src &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	(
+		cd src &&
+		git pull ../testrepo main &&
+		git branch next &&
+		git config remote.dst.url ../dst &&
+		git config remote.dst.fetch "+refs/heads/*:refs/remotes/dst/*" &&
+		git config push.default upstream &&
+
+		git config branch.main.merge refs/heads/trunk &&
+		git config branch.main.remote dst &&
+
+		git push dst main &&
+		git show-ref refs/heads/main |
+		sed -e "s|refs/heads/main|refs/heads/trunk|" >../dst/expect
+	) &&
+	(
+		cd dst &&
+		test_must_fail git show-ref refs/heads/main &&
+		test_must_fail git show-ref refs/heads/next &&
+		git show-ref refs/heads/trunk >actual
+	) &&
+	test_cmp dst/expect dst/actual
+'
+
+test_expect_success 'push does not follow tags by default' '
+	mk_test testrepo heads/main &&
+	test_when_finished "rm -rf src" &&
+	git init src &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	(
+		cd src &&
+		git pull ../testrepo main &&
+		git tag -m "annotated" tag &&
+		git checkout -b another &&
+		git commit --allow-empty -m "future commit" &&
+		git tag -m "future" future &&
+		git checkout main &&
+		git for-each-ref refs/heads/main >../expect &&
+		git push ../dst main
+	) &&
+	(
+		cd dst &&
+		git for-each-ref >../actual
+	) &&
+	test_cmp expect actual
+'
+
+test_expect_success 'push --follow-tags only pushes relevant tags' '
+	mk_test testrepo heads/main &&
+	test_when_finished "rm -rf src" &&
+	git init src &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	(
+		cd src &&
+		git pull ../testrepo main &&
+		git tag -m "annotated" tag &&
+		git checkout -b another &&
+		git commit --allow-empty -m "future commit" &&
+		git tag -m "future" future &&
+		git checkout main &&
+		git for-each-ref refs/heads/main refs/tags/tag >../expect &&
+		git push --follow-tags ../dst main
+	) &&
+	(
+		cd dst &&
+		git for-each-ref >../actual
+	) &&
+	test_cmp expect actual
+'
+
+test_expect_success 'push --no-thin must produce non-thin pack' '
+	cat >>path1 <<\EOF &&
+keep base version of path1 big enough, compared to the new changes
+later, in order to pass size heuristics in
+builtin/pack-objects.c:try_delta()
+EOF
+	git commit -am initial &&
+	git init no-thin &&
+	git --git-dir=no-thin/.git config receive.unpacklimit 0 &&
+	git push no-thin/.git refs/heads/main:refs/heads/foo &&
+	echo modified >> path1 &&
+	git commit -am modified &&
+	git repack -adf &&
+	rcvpck="git receive-pack --reject-thin-pack-for-testing" &&
+	git push --no-thin --receive-pack="$rcvpck" no-thin/.git refs/heads/main:refs/heads/foo
+'
+
+test_expect_success 'pushing a tag pushes the tagged object' '
+	blob=$(echo unreferenced | git hash-object -w --stdin) &&
+	git tag -m foo tag-of-blob $blob &&
+	test_when_finished "rm -rf dst.git" &&
+	git init --bare dst.git &&
+	git push dst.git tag-of-blob &&
+	# the receiving index-pack should have noticed
+	# any problems, but we double check
+	echo unreferenced >expect &&
+	git --git-dir=dst.git cat-file blob tag-of-blob >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'push into bare respects core.logallrefupdates' '
+	test_when_finished "rm -rf dst.git" &&
+	git init --bare dst.git &&
+	git -C dst.git config core.logallrefupdates true &&
+
+	# double push to test both with and without
+	# the actual pack transfer
+	git push dst.git main:one &&
+	echo "one@{0} push" >expect &&
+	git -C dst.git log -g --format="%gd %gs" one >actual &&
+	test_cmp expect actual &&
+
+	git push dst.git main:two &&
+	echo "two@{0} push" >expect &&
+	git -C dst.git log -g --format="%gd %gs" two >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'fetch into bare respects core.logallrefupdates' '
+	test_when_finished "rm -rf dst.git" &&
+	git init --bare dst.git &&
+	(
+		cd dst.git &&
+		git config core.logallrefupdates true &&
+
+		# as above, we double-fetch to test both
+		# with and without pack transfer
+		git fetch .. main:one &&
+		echo "one@{0} fetch .. main:one: storing head" >expect &&
+		git log -g --format="%gd %gs" one >actual &&
+		test_cmp expect actual &&
+
+		git fetch .. main:two &&
+		echo "two@{0} fetch .. main:two: storing head" >expect &&
+		git log -g --format="%gd %gs" two >actual &&
+		test_cmp expect actual
+	)
+'
+
+test_expect_success 'receive.denyCurrentBranch = updateInstead' '
+	mk_empty testrepo &&
+	git push testrepo main &&
+	(
+		cd testrepo &&
+		git reset --hard &&
+		git config receive.denyCurrentBranch updateInstead
+	) &&
+	test_commit third path2 &&
+
+	# Try pushing into a repository with pristine working tree
+	git push testrepo main &&
+	(
+		cd testrepo &&
+		git update-index -q --refresh &&
+		git diff-files --quiet -- &&
+		git diff-index --quiet --cached HEAD -- &&
+		test third = "$(cat path2)" &&
+		test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
+	) &&
+
+	# Try pushing into a repository with working tree needing a refresh
+	(
+		cd testrepo &&
+		git reset --hard HEAD^ &&
+		test $(git -C .. rev-parse HEAD^) = $(git rev-parse HEAD) &&
+		test-tool chmtime +100 path1
+	) &&
+	git push testrepo main &&
+	(
+		cd testrepo &&
+		git update-index -q --refresh &&
+		git diff-files --quiet -- &&
+		git diff-index --quiet --cached HEAD -- &&
+		test_cmp ../path1 path1 &&
+		test third = "$(cat path2)" &&
+		test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
+	) &&
+
+	# Update what is to be pushed
+	test_commit fourth path2 &&
+
+	# Try pushing into a repository with a dirty working tree
+	# (1) the working tree updated
+	(
+		cd testrepo &&
+		echo changed >path1
+	) &&
+	test_must_fail git push testrepo main &&
+	(
+		cd testrepo &&
+		test $(git -C .. rev-parse HEAD^) = $(git rev-parse HEAD) &&
+		git diff --quiet --cached &&
+		test changed = "$(cat path1)"
+	) &&
+
+	# (2) the index updated
+	(
+		cd testrepo &&
+		echo changed >path1 &&
+		git add path1
+	) &&
+	test_must_fail git push testrepo main &&
+	(
+		cd testrepo &&
+		test $(git -C .. rev-parse HEAD^) = $(git rev-parse HEAD) &&
+		git diff --quiet &&
+		test changed = "$(cat path1)"
+	) &&
+
+	# Introduce a new file in the update
+	test_commit fifth path3 &&
+
+	# (3) the working tree has an untracked file that would interfere
+	(
+		cd testrepo &&
+		git reset --hard &&
+		echo changed >path3
+	) &&
+	test_must_fail git push testrepo main &&
+	(
+		cd testrepo &&
+		test $(git -C .. rev-parse HEAD^^) = $(git rev-parse HEAD) &&
+		git diff --quiet &&
+		git diff --quiet --cached &&
+		test changed = "$(cat path3)"
+	) &&
+
+	# (4) the target changes to what gets pushed but it still is a change
+	(
+		cd testrepo &&
+		git reset --hard &&
+		echo fifth >path3 &&
+		git add path3
+	) &&
+	test_must_fail git push testrepo main &&
+	(
+		cd testrepo &&
+		test $(git -C .. rev-parse HEAD^^) = $(git rev-parse HEAD) &&
+		git diff --quiet &&
+		test fifth = "$(cat path3)"
+	) &&
+
+	# (5) push into void
+	test_when_finished "rm -rf void" &&
+	git init void &&
+	(
+		cd void &&
+		git config receive.denyCurrentBranch updateInstead
+	) &&
+	git push void main &&
+	(
+		cd void &&
+		test $(git -C .. rev-parse main) = $(git rev-parse HEAD) &&
+		git diff --quiet &&
+		git diff --cached --quiet
+	) &&
+
+	# (6) updateInstead intervened by fast-forward check
+	test_must_fail git push void main^:main &&
+	test $(git -C void rev-parse HEAD) = $(git rev-parse main) &&
+	git -C void diff --quiet &&
+	git -C void diff --cached --quiet
+'
+
+test_expect_success 'updateInstead with push-to-checkout hook' '
+	test_when_finished "rm -rf testrepo" &&
+	git init testrepo &&
+	git -C testrepo pull .. main &&
+	git -C testrepo reset --hard HEAD^^ &&
+	git -C testrepo tag initial &&
+	git -C testrepo config receive.denyCurrentBranch updateInstead &&
+	test_hook -C testrepo push-to-checkout <<-\EOF &&
+	echo >&2 updating from $(git rev-parse HEAD)
+	echo >&2 updating to "$1"
+
+	git update-index -q --refresh &&
+	git read-tree -u -m HEAD "$1" || {
+		status=$?
+		echo >&2 read-tree failed
+		exit $status
+	}
+	EOF
+
+	# Try pushing into a pristine
+	git push testrepo main &&
+	(
+		cd testrepo &&
+		git diff --quiet &&
+		git diff HEAD --quiet &&
+		test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
+	) &&
+
+	# Try pushing into a repository with conflicting change
+	(
+		cd testrepo &&
+		git reset --hard initial &&
+		echo conflicting >path2
+	) &&
+	test_must_fail git push testrepo main &&
+	(
+		cd testrepo &&
+		test $(git rev-parse initial) = $(git rev-parse HEAD) &&
+		test conflicting = "$(cat path2)" &&
+		git diff-index --quiet --cached HEAD
+	) &&
+
+	# Try pushing into a repository with unrelated change
+	(
+		cd testrepo &&
+		git reset --hard initial &&
+		echo unrelated >path1 &&
+		echo irrelevant >path5 &&
+		git add path5
+	) &&
+	git push testrepo main &&
+	(
+		cd testrepo &&
+		test "$(cat path1)" = unrelated &&
+		test "$(cat path5)" = irrelevant &&
+		test "$(git diff --name-only --cached HEAD)" = path5 &&
+		test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
+	) &&
+
+	# push into void
+	test_when_finished "rm -rf void" &&
+	git init void &&
+	git -C void config receive.denyCurrentBranch updateInstead &&
+	test_hook -C void push-to-checkout <<-\EOF &&
+	if git rev-parse --quiet --verify HEAD
+	then
+		has_head=yes
+		echo >&2 updating from $(git rev-parse HEAD)
+	else
+		has_head=no
+		echo >&2 pushing into void
+	fi
+	echo >&2 updating to "$1"
+
+	git update-index -q --refresh &&
+	case "$has_head" in
+	yes)
+		git read-tree -u -m HEAD "$1" ;;
+	no)
+		git read-tree -u -m "$1" ;;
+	esac || {
+		status=$?
+		echo >&2 read-tree failed
+		exit $status
+	}
+	EOF
+
+	git push void main &&
+	(
+		cd void &&
+		git diff --quiet &&
+		git diff --cached --quiet &&
+		test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
+	)
+'
+
+test_expect_success 'denyCurrentBranch and worktrees' '
+	git worktree add new-wt &&
+	git clone . cloned &&
+	test_commit -C cloned first &&
+	test_config receive.denyCurrentBranch refuse &&
+	test_must_fail git -C cloned push origin HEAD:new-wt &&
+	test_config receive.denyCurrentBranch updateInstead &&
+	git -C cloned push origin HEAD:new-wt &&
+	test_path_exists new-wt/first.t &&
+	test_must_fail git -C cloned push --delete origin new-wt
+'
+
+test_expect_success 'denyCurrentBranch and bare repository worktrees' '
+	test_when_finished "rm -fr bare.git" &&
+	git clone --bare . bare.git &&
+	git -C bare.git worktree add wt &&
+	test_commit grape &&
+	git -C bare.git config receive.denyCurrentBranch refuse &&
+	test_must_fail git push bare.git HEAD:wt &&
+	git -C bare.git config receive.denyCurrentBranch updateInstead &&
+	git push bare.git HEAD:wt &&
+	test_path_exists bare.git/wt/grape.t &&
+	test_must_fail git push --delete bare.git wt
+'
+
+test_expect_success 'refuse fetch to current branch of worktree' '
+	test_when_finished "git worktree remove --force wt && git branch -D wt" &&
+	git worktree add wt &&
+	test_commit apple &&
+	test_must_fail git fetch . HEAD:wt &&
+	git fetch -u . HEAD:wt
+'
+
+test_expect_success 'refuse fetch to current branch of bare repository worktree' '
+	test_when_finished "rm -fr bare.git" &&
+	git clone --bare . bare.git &&
+	git -C bare.git worktree add wt &&
+	test_commit banana &&
+	test_must_fail git -C bare.git fetch .. HEAD:wt &&
+	git -C bare.git fetch -u .. HEAD:wt
+'
+
+test_expect_success 'refuse to push a hidden ref, and make sure do not pollute the repository' '
+	mk_empty testrepo &&
+	git -C testrepo config receive.hiderefs refs/hidden &&
+	git -C testrepo config receive.unpackLimit 1 &&
+	test_must_fail git push testrepo HEAD:refs/hidden/foo &&
+	test_dir_is_empty testrepo/.git/objects/pack
+'
+
+test_expect_success 'push with config push.useBitmaps' '
+	mk_test testrepo heads/main &&
+	git checkout main &&
+	test_unconfig push.useBitmaps &&
+	GIT_TRACE2_EVENT="$PWD/default" \
+	git push --quiet testrepo main:test &&
+	test_subcommand git pack-objects --all-progress-implied --revs --stdout \
+		--thin --delta-base-offset -q <default &&
+
+	test_config push.useBitmaps true &&
+	GIT_TRACE2_EVENT="$PWD/true" \
+	git push --quiet testrepo main:test2 &&
+	test_subcommand git pack-objects --all-progress-implied --revs --stdout \
+		--thin --delta-base-offset -q <true &&
+
+	test_config push.useBitmaps false &&
+	GIT_TRACE2_EVENT="$PWD/false" \
+	git push --quiet testrepo main:test3 &&
+	test_subcommand git pack-objects --all-progress-implied --revs --stdout \
+		--thin --delta-base-offset -q --no-use-bitmap-index <false
+'
+
+test_done