set --abbrev-commit to return 8-digit hash strings

fix #680 : unpushed commits still appear to be green instead of red
Fix OutOfBound array access when looking for ReflogCommits
2026-10-03 12:36:57 -04:00 · 2020-02-27 18:05:41 +11:00 · 2020-02-27 18:05:41 +11:00 · 2020-02-27 09:34:40 +11:00
2 changed files with 2 additions and 2 deletions
@@ -298,7 +298,7 @@ func (c *CommitListBuilder) getMergeBase() (string, error) {
 // to the remote branch of the current branch, a map is returned to ease look up
 func (c *CommitListBuilder) getUnpushedCommits() map[string]bool {
 	pushables := map[string]bool{}
-	o, err := c.OSCommand.RunCommandWithOutput("git rev-list @{u}..HEAD --abbrev-commit")
+	o, err := c.OSCommand.RunCommandWithOutput("git rev-list @{u}..HEAD --abbrev-commit --abbrev=8")
 	if err != nil {
 		return pushables
 	}
@@ -1115,7 +1115,7 @@ func (c *GitCommand) GetReflogCommits() ([]*Commit, error) {
 	re := regexp.MustCompile(`(\w+).*HEAD@\{\d+\}: (.*)`)
 	for i, line := range lines {
 		match := re.FindStringSubmatch(line)
-		if len(match) == 1 {
+		if len(match) <= 1 {
 			continue
 		}
Author	SHA1	Message	Date
David Chen	a9fe0b8000	set --abbrev-commit to return 8-digit hash strings	2020-02-27 18:05:41 +11:00
David Chen	5af7b0235e	fix #680 : unpushed commits still appear to be green instead of red	2020-02-27 18:05:41 +11:00
Corentin Rossignon	bf946200e9	Fix OutOfBound array access when looking for ReflogCommits refs #679	2020-02-27 09:34:40 +11:00