From 27e0450aca03aed6da4c9fbaa551d6ba75937da7 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 29 Aug 2025 22:24:43 -0700 Subject: [PATCH] Fix test --- tests/integration/pull_merge_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/integration/pull_merge_test.go b/tests/integration/pull_merge_test.go index 56395a5ba2..35a7ea00c7 100644 --- a/tests/integration/pull_merge_test.go +++ b/tests/integration/pull_merge_test.go @@ -341,8 +341,10 @@ func TestCantMergeUnrelated(t *testing.T) { assert.NoError(t, err) commitSha := strings.TrimSpace(stdout.String()) - _, _, err = git.NewCommand("branch", "unrelated").AddDynamicArguments(commitSha).RunStdString(t.Context(), &git.RunOpts{Dir: path}) + gitRepo1, err := gitrepo.OpenRepository(t.Context(), repo1) assert.NoError(t, err) + defer gitRepo1.Close() + assert.NoError(t, repo_service.CreateNewBranchFromCommit(t.Context(), user1, repo1, gitRepo1, commitSha, "unrelated")) testEditFileToNewBranch(t, session, "user1", "repo1", "master", "conflict", "README.md", "Hello, World (Edited Once)\n")