models/git/commit_status_test.go

@@ -60,118 +60,3 @@ func TestGetCommitStatuses(t *testing.T) {
 	assert.Equal(t, int(maxResults), 5)
 	assert.Empty(t, statuses)
 }
-
-func Test_CalcCommitStatus(t *testing.T) {
-	kases := []struct {
-		statuses []*git_model.CommitStatus
-		expected *git_model.CommitStatus
-	}{
-		{
-			statuses: []*git_model.CommitStatus{
-				{
-					State: structs.CommitStatusPending,
-				},
-			},
-			expected: &git_model.CommitStatus{
-				State: structs.CommitStatusPending,
-			},
-		},
-		{
-			statuses: []*git_model.CommitStatus{
-				{
-					State: structs.CommitStatusSuccess,
-				},
-				{
-					State: structs.CommitStatusPending,
-				},
-			},
-			expected: &git_model.CommitStatus{
-				State: structs.CommitStatusPending,
-			},
-		},
-		{
-			statuses: []*git_model.CommitStatus{
-				{
-					State: structs.CommitStatusSuccess,
-				},
-				{
-					State: structs.CommitStatusPending,
-				},
-				{
-					State: structs.CommitStatusSuccess,
-				},
-			},
-			expected: &git_model.CommitStatus{
-				State: structs.CommitStatusPending,
-			},
-		},
-		{
-			statuses: []*git_model.CommitStatus{
-				{
-					State: structs.CommitStatusError,
-				},
-				{
-					State: structs.CommitStatusPending,
-				},
-				{
-					State: structs.CommitStatusSuccess,
-				},
-			},
-			expected: &git_model.CommitStatus{
-				State: structs.CommitStatusError,
-			},
-		},
-		{
-			statuses: []*git_model.CommitStatus{
-				{
-					State: structs.CommitStatusWarning,
-				},
-				{
-					State: structs.CommitStatusPending,
-				},
-				{
-					State: structs.CommitStatusSuccess,
-				},
-			},
-			expected: &git_model.CommitStatus{
-				State: structs.CommitStatusWarning,
-			},
-		},
-		{
-			statuses: []*git_model.CommitStatus{
-				{
-					State: structs.CommitStatusSuccess,
-				},
-				{
-					State: structs.CommitStatusSuccess,
-				},
-				{
-					State: structs.CommitStatusSuccess,
-				},
-			},
-			expected: &git_model.CommitStatus{
-				State: structs.CommitStatusSuccess,
-			},
-		},
-		{
-			statuses: []*git_model.CommitStatus{
-				{
-					State: structs.CommitStatusFailure,
-				},
-				{
-					State: structs.CommitStatusError,
-				},
-				{
-					State: structs.CommitStatusWarning,
-				},
-			},
-			expected: &git_model.CommitStatus{
-				State: structs.CommitStatusError,
-			},
-		},
-	}
-
-	for _, kase := range kases {
-		assert.Equal(t, kase.expected, git_model.CalcCommitStatus(kase.statuses))
-	}
-}

models/migrations/migrations.go

@@ -552,8 +552,6 @@ var migrations = []Migration{
 	NewMigration("Add Index to pull_auto_merge.doer_id", v1_22.AddIndexToPullAutoMergeDoerID),
 	// v283 -> v284
 	NewMigration("Add combined Index to issue_user.uid and issue_id", v1_22.AddCombinedIndexToIssueUser),
-	// v284 -> v285
-	NewMigration("Add ignore stale approval column on branch table", v1_22.AddIgnoreStaleApprovalsColumnToProtectedBranchTable),
 }
 
 // GetCurrentDBVersion returns the current db version

modules/git/git.go

@@ -166,6 +166,10 @@ func InitSimple(ctx context.Context) error {
 // InitFull initializes git module with version check and change global variables, sync gitconfig.
 // It should only be called once at the beginning of the program initialization (TestMain/GlobalInitInstalled) as this code makes unsynchronized changes to variables.
 func InitFull(ctx context.Context) (err error) {
+	if err = checkInit(); err != nil {
+		return err
+	}
+
 	if err = InitSimple(ctx); err != nil {
 		return err
 	}