Use the defaults in diff-highlight if nothing is set in the git config

scottchiefbaker · scottchiefbaker · commit 15c702b04fdd · 2021-05-31T17:00:25.000-07:00
diff --git a/diff-so-fancy b/diff-so-fancy
@@ -1066,12 +1066,13 @@ sub yes_no {
 	}
 }
 
+# If there are colors set in the gitconfig use those, otherwise leave the defaults
 sub init_diff_highlight_colors {
-	$DiffHighlight::NEW_HIGHLIGHT[0] = git_ansi_color(git_config('color.diff-highlight.newnormal'))    || color("2_bold");
-	$DiffHighlight::NEW_HIGHLIGHT[1] = git_ansi_color(git_config('color.diff-highlight.newhighlight')) || color("2_bold") . color("on_22");
+	$DiffHighlight::NEW_HIGHLIGHT[0] = git_ansi_color(git_config('color.diff-highlight.newnormal'))    || $DiffHighlight::NEW_HIGHLIGHT[0];
+	$DiffHighlight::NEW_HIGHLIGHT[1] = git_ansi_color(git_config('color.diff-highlight.newhighlight')) || $DiffHighlight::NEW_HIGHLIGHT[1];
 
-	$DiffHighlight::OLD_HIGHLIGHT[0] = git_ansi_color(git_config('color.diff-highlight.oldnormal'))    || color("1_bold");
-	$DiffHighlight::OLD_HIGHLIGHT[1] = git_ansi_color(git_config('color.diff-highlight.oldhighlight')) || color("1_bold") . color("on_52");
+	$DiffHighlight::OLD_HIGHLIGHT[0] = git_ansi_color(git_config('color.diff-highlight.oldnormal'))    || $DiffHighlight::OLD_HIGHLIGHT[0];
+	$DiffHighlight::OLD_HIGHLIGHT[1] = git_ansi_color(git_config('color.diff-highlight.oldhighlight')) || $DiffHighlight::OLD_HIGHLIGHT[1];
 }
 
 # vim: tabstop=4 shiftwidth=4 noexpandtab autoindent softtabstop=4

Original file line number	Diff line number	Diff line change
`@@ -1066,12 +1066,13 @@ sub yes_no {`
`1066`	`1066`	`}`
`1067`	`1067`	`}`
`1068`	`1068`
	`1069`	`+# If there are colors set in the gitconfig use those, otherwise leave the defaults`
`1069`	`1070`	`sub init_diff_highlight_colors {`
`1070`		`- $DiffHighlight::NEW_HIGHLIGHT[0] = git_ansi_color(git_config('color.diff-highlight.newnormal')) \|\| color("2_bold");`
`1071`		`- $DiffHighlight::NEW_HIGHLIGHT[1] = git_ansi_color(git_config('color.diff-highlight.newhighlight')) \|\| color("2_bold") . color("on_22");`
	`1071`	`+ $DiffHighlight::NEW_HIGHLIGHT[0] = git_ansi_color(git_config('color.diff-highlight.newnormal')) \|\| $DiffHighlight::NEW_HIGHLIGHT[0];`
	`1072`	`+ $DiffHighlight::NEW_HIGHLIGHT[1] = git_ansi_color(git_config('color.diff-highlight.newhighlight')) \|\| $DiffHighlight::NEW_HIGHLIGHT[1];`
`1072`	`1073`
`1073`		`- $DiffHighlight::OLD_HIGHLIGHT[0] = git_ansi_color(git_config('color.diff-highlight.oldnormal')) \|\| color("1_bold");`
`1074`		`- $DiffHighlight::OLD_HIGHLIGHT[1] = git_ansi_color(git_config('color.diff-highlight.oldhighlight')) \|\| color("1_bold") . color("on_52");`
	`1074`	`+ $DiffHighlight::OLD_HIGHLIGHT[0] = git_ansi_color(git_config('color.diff-highlight.oldnormal')) \|\| $DiffHighlight::OLD_HIGHLIGHT[0];`
	`1075`	`+ $DiffHighlight::OLD_HIGHLIGHT[1] = git_ansi_color(git_config('color.diff-highlight.oldhighlight')) \|\| $DiffHighlight::OLD_HIGHLIGHT[1];`
`1075`	`1076`	`}`
`1076`	`1077`
`1077`	`1078`	`# vim: tabstop=4 shiftwidth=4 noexpandtab autoindent softtabstop=4`