Fix index out of bounds panic when repository has massive tag lists

Author: chojs23

pkg/commands/git_commands/commit_loader.go

@@ -202,17 +202,33 @@ func (self *CommitLoader) MergeRebasingCommits(hashPool *utils.StringPool, commi
 func (self *CommitLoader) extractCommitFromLine(hashPool *utils.StringPool, line string, showDivergence bool) *models.Commit {
 	split := strings.SplitN(line, "\x00", 8)
 
+	// Ensure we have the minimum required fields (at least 5 for basic functionality)
+	if len(split) < 5 {
+		self.Log.Warnf("Malformed git log line: expected at least 5 fields, got %d. Line: %s", len(split), line)
+		return nil
+	}
+
 	hash := split[0]
 	unixTimestamp := split[1]
 	authorName := split[2]
 	authorEmail := split[3]
 	extraInfo := strings.TrimSpace(split[4])
-	parentHashes := split[5]
+
+	// Safe access to optional fields with defaults
+	parentHashes := ""
+	if len(split) > 5 {
+		parentHashes = split[5]
+	}
+
 	divergence := models.DivergenceNone
-	if showDivergence {
+	if showDivergence && len(split) > 6 {
 		divergence = lo.Ternary(split[6] == "<", models.DivergenceLeft, models.DivergenceRight)
 	}
-	message := split[7]
+
+	message := ""
+	if len(split) > 7 {
+		message = split[7]
+	}
 
 	tags := []string{}
 

pkg/commands/git_commands/commit_loader_test.go

@@ -588,3 +588,61 @@ func TestCommitLoader_setCommitMergedStatuses(t *testing.T) {
 		})
 	}
 }
+
+func TestCommitLoader_extractCommitFromLine(t *testing.T) {
+	common := common.NewDummyCommon()
+	hashPool := &utils.StringPool{}
+
+	loader := &CommitLoader{
+		Common: common,
+	}
+
+	scenarios := []struct {
+		testName       string
+		line           string
+		showDivergence bool
+		expectedNil    bool
+	}{
+		{
+			testName:       "normal commit line",
+			line:           "0eea75e8c631fba6b58135697835d58ba4c18dbc\x001640826609\x00Jesse Duffield\x00jessedduffield@gmail.com\x00HEAD -> better-tests\x00b21997d6b4cbdf84b149\x00>\x00better typing for rebase mode",
+			showDivergence: true,
+			expectedNil:    false,
+		},
+		{
+			testName:       "malformed line with only 3 fields",
+			line:           "hash\x00timestamp\x00author",
+			showDivergence: false,
+			expectedNil:    true,
+		},
+		{
+			testName:       "malformed line with only 4 fields",
+			line:           "hash\x00timestamp\x00author\x00email",
+			showDivergence: false,
+			expectedNil:    true,
+		},
+		{
+			testName:       "minimal valid line with 5 fields",
+			line:           "hash\x00timestamp\x00author\x00email\x00extraInfo",
+			showDivergence: false,
+			expectedNil:    false,
+		},
+		{
+			testName:       "line missing divergence field when expected",
+			line:           "hash\x00timestamp\x00author\x00email\x00extraInfo\x00parents",
+			showDivergence: true,
+			expectedNil:    false,
+		},
+	}
+
+	for _, scenario := range scenarios {
+		t.Run(scenario.testName, func(t *testing.T) {
+			result := loader.extractCommitFromLine(hashPool, scenario.line, scenario.showDivergence)
+			if scenario.expectedNil {
+				assert.Nil(t, result)
+			} else {
+				assert.NotNil(t, result)
+			}
+		})
+	}
+}