Merge pull request #8251 from dolthub/liuliu/color-string-fix

liuliu/color-string-fix
dolthub · Aug 12, 2024 · a7b7fde · a7b7fde
2 parents 807a42b + e53c2f3
commit a7b7fde
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/go/cmd/dolt/commands/log_graph.go b/go/cmd/dolt/commands/log_graph.go
@@ -436,7 +436,7 @@ func printGraphAndCommitsInfo(graph [][]string, pager *outputpager.Pager, apr *a
 	last_commit_row := commits[len(commits)-1].Row
 	printCommitMetadata(graph, pager, last_commit_row, len(graph[last_commit_row]), commits[len(commits)-1], decoration)
 	for _, line := range commits[len(commits)-1].formattedMessage {
-		pager.Writer.Write([]byte(color.WhiteString("\t", line)))
+		pager.Writer.Write([]byte(color.WhiteString("\t%s", line)))
 		pager.Writer.Write([]byte("\n"))
 	}
 }

diff --git a/integration-tests/bats/log.bats b/integration-tests/bats/log.bats
@@ -844,10 +844,11 @@ export NO_COLOR=1
     [[  "${lines[7]}" =~ "Author:" ]] || false                            #   Author: 
     [[  "${lines[8]}" =~ "Date:" ]] || false                              #   Date: 
     [[  "${lines[9]}" =~ "Initialize data repository" ]] || false         #      Initialize data repository
+    [[ ! "${lines[9]}" =~ "%!(EXTRA string=" ]] || false
 
     run dolt log --graph --oneline
     [ "$status" -eq 0 ]
-
+    
     [[ "${lines[0]}" =~ \* ]] || false
     [[ ! "$output" =~ "Author" ]] || false
     [[ ! "$output" =~ "Date" ]] || false