Skip to content

Commit baffff2

Browse files
committed
revert unnecessary change
1 parent 72ba762 commit baffff2

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

tests/integration/pull_merge_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,6 @@ func TestCantMergeUnrelated(t *testing.T) {
421421
// Now this PR could be marked conflict - or at least a race may occur - so drop down to pure code at this point...
422422
gitRepo, err := gitrepo.OpenRepository(t.Context(), repo1)
423423
assert.NoError(t, err)
424-
defer gitRepo.Close()
425424
pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{
426425
HeadRepoID: repo1.ID,
427426
BaseRepoID: repo1.ID,
@@ -432,6 +431,7 @@ func TestCantMergeUnrelated(t *testing.T) {
432431
err = pull_service.Merge(t.Context(), pr, user1, gitRepo, repo_model.MergeStyleMerge, "", "UNRELATED", false)
433432
assert.Error(t, err, "Merge should return an error due to unrelated")
434433
assert.True(t, pull_service.IsErrMergeUnrelatedHistories(err), "Merge error is not a unrelated histories error")
434+
gitRepo.Close()
435435
})
436436
}
437437

0 commit comments

Comments
 (0)