Merge pull request cli#4363 from RasmusWL/patch-1

mislav · web-flow · commit c4ec0a65bace · 2021-09-30T12:01:47.000+02:00
Also set `pushRemote` on `gh pr checkout` from fork
diff --git a/pkg/cmd/pr/checkout/checkout.go b/pkg/cmd/pr/checkout/checkout.go
@@ -220,7 +220,11 @@ func cmdsForMissingRemote(pr *api.PullRequest, baseURLOrName, repoHost, defaultB
 		mergeRef = fmt.Sprintf("refs/heads/%s", pr.HeadRefName)
 	}
 	if missingMergeConfigForBranch(localBranch) {
+		// .remote is needed for `git pull` to work
+		// .pushRemote is needed for `git push` to work, if user has set `remote.pushDefault`.
+		// see https://git-scm.com/docs/git-config#Documentation/git-config.txt-branchltnamegtremote
 		cmds = append(cmds, []string{"git", "config", fmt.Sprintf("branch.%s.remote", localBranch), remote})
+		cmds = append(cmds, []string{"git", "config", fmt.Sprintf("branch.%s.pushRemote", localBranch), remote})
 		cmds = append(cmds, []string{"git", "config", fmt.Sprintf("branch.%s.merge", localBranch), mergeRef})
 	}
 
diff --git a/pkg/cmd/pr/checkout/checkout_test.go b/pkg/cmd/pr/checkout/checkout_test.go
@@ -97,6 +97,7 @@ func Test_checkoutRun(t *testing.T) {
 				cs.Register(`git config branch\.feature\.merge`, 1, "")
 				cs.Register(`git checkout feature`, 0, "")
 				cs.Register(`git config branch\.feature\.remote origin`, 0, "")
+				cs.Register(`git config branch\.feature\.pushRemote origin`, 0, "")
 				cs.Register(`git config branch\.feature\.merge refs/pull/123/head`, 0, "")
 			},
 		},
@@ -152,6 +153,7 @@ func Test_checkoutRun(t *testing.T) {
 				cs.Register(`git fetch origin refs/pull/123/head:foobar`, 0, "")
 				cs.Register(`git checkout foobar`, 0, "")
 				cs.Register(`git config branch\.foobar\.remote https://github.com/hubot/REPO.git`, 0, "")
+				cs.Register(`git config branch\.foobar\.pushRemote https://github.com/hubot/REPO.git`, 0, "")
 				cs.Register(`git config branch\.foobar\.merge refs/heads/feature`, 0, "")
 			},
 		},
@@ -343,6 +345,7 @@ func TestPRCheckout_differentRepo(t *testing.T) {
 	cs.Register(`git config branch\.feature\.merge`, 1, "")
 	cs.Register(`git checkout feature`, 0, "")
 	cs.Register(`git config branch\.feature\.remote origin`, 0, "")
+	cs.Register(`git config branch\.feature\.pushRemote origin`, 0, "")
 	cs.Register(`git config branch\.feature\.merge refs/pull/123/head`, 0, "")
 
 	output, err := runCommand(http, nil, "master", `123`)
@@ -442,6 +445,7 @@ func TestPRCheckout_maintainerCanModify(t *testing.T) {
 	cs.Register(`git config branch\.feature\.merge`, 1, "")
 	cs.Register(`git checkout feature`, 0, "")
 	cs.Register(`git config branch\.feature\.remote https://github\.com/hubot/REPO\.git`, 0, "")
+	cs.Register(`git config branch\.feature\.pushRemote https://github\.com/hubot/REPO\.git`, 0, "")
 	cs.Register(`git config branch\.feature\.merge refs/heads/feature`, 0, "")
 
 	output, err := runCommand(http, nil, "master", `123`)

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,11 @@ func cmdsForMissingRemote(pr *api.PullRequest, baseURLOrName, repoHost, defaultB`
`220`	`220`	`mergeRef = fmt.Sprintf("refs/heads/%s", pr.HeadRefName)`
`221`	`221`	`}`
`222`	`222`	`if missingMergeConfigForBranch(localBranch) {`
	`223`	+ // .remote is needed for `git pull` to work
	`224`	+ // .pushRemote is needed for `git push` to work, if user has set `remote.pushDefault`.
	`225`	`+ // see https://git-scm.com/docs/git-config#Documentation/git-config.txt-branchltnamegtremote`
`223`	`226`	`cmds = append(cmds, []string{"git", "config", fmt.Sprintf("branch.%s.remote", localBranch), remote})`
	`227`	`+ cmds = append(cmds, []string{"git", "config", fmt.Sprintf("branch.%s.pushRemote", localBranch), remote})`
`224`	`228`	`cmds = append(cmds, []string{"git", "config", fmt.Sprintf("branch.%s.merge", localBranch), mergeRef})`
`225`	`229`	`}`
`226`	`230`