Skip to content

Commit 27e0450

Browse files
committed
Fix test
1 parent b580b59 commit 27e0450

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

tests/integration/pull_merge_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,8 +341,10 @@ func TestCantMergeUnrelated(t *testing.T) {
341341
assert.NoError(t, err)
342342
commitSha := strings.TrimSpace(stdout.String())
343343

344-
_, _, err = git.NewCommand("branch", "unrelated").AddDynamicArguments(commitSha).RunStdString(t.Context(), &git.RunOpts{Dir: path})
344+
gitRepo1, err := gitrepo.OpenRepository(t.Context(), repo1)
345345
assert.NoError(t, err)
346+
defer gitRepo1.Close()
347+
assert.NoError(t, repo_service.CreateNewBranchFromCommit(t.Context(), user1, repo1, gitRepo1, commitSha, "unrelated"))
346348

347349
testEditFileToNewBranch(t, session, "user1", "repo1", "master", "conflict", "README.md", "Hello, World (Edited Once)\n")
348350

0 commit comments

Comments
 (0)