Merge branch 'jt/clone-unborn-head'

gitster · gitster · commit cc930b7472a4 · 2021-03-19T15:25:38.000-07:00
Test fix.

* jt/clone-unborn-head:
  t5606: run clone branch name test with protocol v2
diff --git a/t/t5606-clone-options.sh b/t/t5606-clone-options.sh
@@ -109,7 +109,7 @@ test_expect_success 'chooses correct default initial branch name' '
 	git -c init.defaultBranch=foo init --bare empty &&
 	test_config -C empty lsrefs.unborn advertise &&
 	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
-	git -c init.defaultBranch=up clone empty whats-up &&
+	git -c init.defaultBranch=up -c protocol.version=2 clone empty whats-up &&
 	test refs/heads/foo = $(git -C whats-up symbolic-ref HEAD) &&
 	test refs/heads/foo = $(git -C whats-up config branch.foo.merge)
 '

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ test_expect_success 'chooses correct default initial branch name' '`
`109`	`109`	`git -c init.defaultBranch=foo init --bare empty &&`
`110`	`110`	`test_config -C empty lsrefs.unborn advertise &&`
`111`	`111`	`GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \`
`112`		`- git -c init.defaultBranch=up clone empty whats-up &&`
	`112`	`+ git -c init.defaultBranch=up -c protocol.version=2 clone empty whats-up &&`
`113`	`113`	`test refs/heads/foo = $(git -C whats-up symbolic-ref HEAD) &&`
`114`	`114`	`test refs/heads/foo = $(git -C whats-up config branch.foo.merge)`
`115`	`115`	`'`