Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Okstad <pokstad@gitlab.com>2020-07-17 00:33:35 +0300
committerPaul Okstad <pokstad@gitlab.com>2020-07-17 00:33:35 +0300
commit1f92e976e5c9e1287980fe7427ef16439c8ef2e6 (patch)
treece13bbcad6ccceaf0189e9a2fcdddbf5162f1f36
parentff777d9003b3f5baeaca8c4478f22a4a67c445a4 (diff)
Create same target branch for read-only copypo-rs-cherry-pick-revert-dry-run
-rw-r--r--internal/service/operations/cherry_pick_test.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/internal/service/operations/cherry_pick_test.go b/internal/service/operations/cherry_pick_test.go
index f787c2a96..be2e9997e 100644
--- a/internal/service/operations/cherry_pick_test.go
+++ b/internal/service/operations/cherry_pick_test.go
@@ -34,8 +34,9 @@ func TestSuccessfulUserCherryPickRequest(t *testing.T) {
cherryPickedCommit, err := log.GetCommit(ctxOuter, testRepo, "8a0f2ee90d940bfb0ba1e14e8214b0649056e4ab")
require.NoError(t, err)
- testRepoCopy, _, cleanup := testhelper.NewTestRepo(t) // read-only repo
+ testRepoCopy, testRepoCopyPath, cleanup := testhelper.NewTestRepo(t) // read-only repo
defer cleanup()
+ testhelper.MustRunCommand(t, nil, "git", "-C", testRepoCopyPath, "branch", destinationBranch, "master")
testCases := []struct {
desc string