Skip to content

Commit

Permalink
Merge pull request #8261 from dolthub/liuliu/graph-spaces-fix
Browse files Browse the repository at this point in the history
liuliu/graph-spaces-fix
  • Loading branch information
liuliu-dev authored Aug 13, 2024
2 parents 891ce8b + 20a3430 commit 1674c97
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion go/cmd/dolt/commands/log_graph.go
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ func printOneLineGraph(graph [][]string, pager *outputpager.Pager, apr *argparse
pager.Writer.Write([]byte("\n"))
}

pager.Writer.Write([]byte(fmt.Sprintf("%s %s ", strings.Join(graph[commits[i].Row], ""), color.YellowString("commit%s ", commits[i].Commit.commitHash))))
pager.Writer.Write([]byte(fmt.Sprintf("%s %s ", strings.Join(graph[commits[i].Row], ""), color.YellowString("commit %s ", commits[i].Commit.commitHash))))
if decoration != "no" {
printRefs(pager, &commits[i].Commit, decoration)
}
Expand Down
4 changes: 2 additions & 2 deletions go/cmd/dolt/commands/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -631,14 +631,14 @@ func printRefs(pager *outputpager.Pager, comm *CommitInfo, decoration string) {
yellow := color.New(color.FgYellow)
boldCyan := color.New(color.FgCyan, color.Bold)

pager.Writer.Write([]byte(yellow.Sprintf(" (")))
pager.Writer.Write([]byte(yellow.Sprintf("(")))

if comm.isHead {
pager.Writer.Write([]byte(boldCyan.Sprintf("HEAD -> ")))
}

joinedReferences := strings.Join(references, yellow.Sprint(", "))
pager.Writer.Write([]byte(yellow.Sprintf("%s)", joinedReferences)))
pager.Writer.Write([]byte(yellow.Sprintf("%s) ", joinedReferences)))
}

// getCommitInfo returns the commit info for the given ref.
Expand Down

0 comments on commit 1674c97

Please sign in to comment.