Move functions sequence

Author: lunny

models/git/branches_test.go

@@ -97,31 +97,6 @@ func TestFindRenamedBranch(t *testing.T) {
 	assert.Equal(t, false, exist)
 }
 
-func TestOnlyGetDeletedBranchOnCorrectRepo(t *testing.T) {
-	assert.NoError(t, unittest.PrepareTestDatabase())
-
-	// Get deletedBranch with ID of 1 on repo with ID 2.
-	// This should return a nil branch as this deleted branch
-	// is actually on repo with ID 1.
-	repo2 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2}).(*repo_model.Repository)
-
-	deletedBranch, err := git_model.GetDeletedBranchByID(repo2.ID, 1)
-
-	// Expect no error, and the returned branch is nil.
-	assert.NoError(t, err)
-	assert.Nil(t, deletedBranch)
-
-	// Now get the deletedBranch with ID of 1 on repo with ID 1.
-	// This should return the deletedBranch.
-	repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}).(*repo_model.Repository)
-
-	deletedBranch, err = git_model.GetDeletedBranchByID(repo1.ID, 1)
-
-	// Expect no error, and the returned branch to be not nil.
-	assert.NoError(t, err)
-	assert.NotNil(t, deletedBranch)
-}
-
 func TestRenameBranch(t *testing.T) {
 	assert.NoError(t, unittest.PrepareTestDatabase())
 	repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}).(*repo_model.Repository)
@@ -161,3 +136,28 @@ func TestRenameBranch(t *testing.T) {
 		BranchName: "main",
 	})
 }
+
+func TestOnlyGetDeletedBranchOnCorrectRepo(t *testing.T) {
+	assert.NoError(t, unittest.PrepareTestDatabase())
+
+	// Get deletedBranch with ID of 1 on repo with ID 2.
+	// This should return a nil branch as this deleted branch
+	// is actually on repo with ID 1.
+	repo2 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2}).(*repo_model.Repository)
+
+	deletedBranch, err := git_model.GetDeletedBranchByID(repo2.ID, 1)
+
+	// Expect no error, and the returned branch is nil.
+	assert.NoError(t, err)
+	assert.Nil(t, deletedBranch)
+
+	// Now get the deletedBranch with ID of 1 on repo with ID 1.
+	// This should return the deletedBranch.
+	repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}).(*repo_model.Repository)
+
+	deletedBranch, err = git_model.GetDeletedBranchByID(repo1.ID, 1)
+
+	// Expect no error, and the returned branch to be not nil.
+	assert.NoError(t, err)
+	assert.NotNil(t, deletedBranch)
+}

models/git/lfs.go

@@ -317,7 +317,7 @@ func CopyLFS(ctx context.Context, newRepo, oldRepo *repo_model.Repository) error
 	for _, v := range lfsObjects {
 		v.ID = 0
 		v.RepositoryID = newRepo.ID
-		if _, err := db.GetEngine(ctx).Insert(v); err != nil {
+		if err := db.Insert(ctx, v); err != nil {
 			return err
 		}
 	}