From 0006091d766ce3016ff3f2c84d3dc430bd2349bb Mon Sep 17 00:00:00 2001 From: Andy Feller Date: Wed, 18 Dec 2024 12:26:43 +1100 Subject: [PATCH] Fix up intra-org fork test setup [1] https://github.com/cli/cli/commit/96ac8d6a2fb268a5825e155ae398e640d3e472fd --- pkg/cmd/pr/shared/finder_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/cmd/pr/shared/finder_test.go b/pkg/cmd/pr/shared/finder_test.go index 7c9f1ab57..ffa0615a9 100644 --- a/pkg/cmd/pr/shared/finder_test.go +++ b/pkg/cmd/pr/shared/finder_test.go @@ -456,6 +456,7 @@ func TestFind(t *testing.T) { return "blueberries", nil }, branchConfig: func(branch string) (c git.BranchConfig) { + c.MergeRef = "refs/heads/main" c.RemoteName = "origin" c.PushRemoteName = "origin" c.Push = "origin/blueberries" @@ -465,6 +466,9 @@ func TestFind(t *testing.T) { return context.Remotes{{ Remote: &git.Remote{Name: "origin"}, Repo: ghrepo.New("OWNER", "REPO-FORK"), + }, { + Remote: &git.Remote{Name: "upstream"}, + Repo: ghrepo.New("OWNER", "REPO"), }}, nil }, },