diff options
| author | Dan Davison <dandavison7@gmail.com> | 2021-11-22 15:08:25 -0500 |
|---|---|---|
| committer | Dan Davison <dandavison7@gmail.com> | 2021-11-22 15:08:25 -0500 |
| commit | 22ad2bcad5e20e698b212ea526da41d7fc00efec (patch) | |
| tree | 6a8dcfeb2f3057d5aa4a78d37fe4a72dd2d427e5 /src/parse_styles.rs | |
| parent | 17ad9785a63c8682953c1ea8c01a0f094b7d65e3 (diff) | |
Fix non-compiling code after independent merges
Diffstat (limited to 'src/parse_styles.rs')
| -rw-r--r-- | src/parse_styles.rs | 40 |
1 files changed, 35 insertions, 5 deletions
diff --git a/src/parse_styles.rs b/src/parse_styles.rs index 86d869ea..39e436f7 100644 --- a/src/parse_styles.rs +++ b/src/parse_styles.rs @@ -353,7 +353,13 @@ fn make_grep_styles(opt: &cli::Opt, styles: &mut HashMap<&str, StyleReference>) ( "grep-match-line-style", if let Some(s) = &opt.grep_match_line_style { - style_from_str(s, None, None, opt.computed.true_color) + style_from_str( + s, + None, + None, + opt.computed.true_color, + opt.git_config.as_ref(), + ) } else { StyleReference::Reference("zero-style".to_owned()) }, @@ -361,7 +367,13 @@ fn make_grep_styles(opt: &cli::Opt, styles: &mut HashMap<&str, StyleReference>) ( "grep-match-word-style", if let Some(s) = &opt.grep_match_word_style { - style_from_str(s, None, None, opt.computed.true_color) + style_from_str( + s, + None, + None, + opt.computed.true_color, + opt.git_config.as_ref(), + ) } else { StyleReference::Reference("plus-emph-style".to_owned()) }, @@ -369,7 +381,13 @@ fn make_grep_styles(opt: &cli::Opt, styles: &mut HashMap<&str, StyleReference>) ( "grep-context-line-style", if let Some(s) = &opt.grep_context_line_style { - style_from_str(s, None, None, opt.computed.true_color) + style_from_str( + s, + None, + None, + opt.computed.true_color, + opt.git_config.as_ref(), + ) } else { StyleReference::Reference("zero-style".to_owned()) }, @@ -377,7 +395,13 @@ fn make_grep_styles(opt: &cli::Opt, styles: &mut HashMap<&str, StyleReference>) ( "grep-file-style", if let Some(s) = &opt.grep_file_style { - style_from_str(s, None, None, opt.computed.true_color) + style_from_str( + s, + None, + None, + opt.computed.true_color, + opt.git_config.as_ref(), + ) } else { StyleReference::Reference("hunk-header-file-style".to_owned()) }, @@ -385,7 +409,13 @@ fn make_grep_styles(opt: &cli::Opt, styles: &mut HashMap<&str, StyleReference>) ( "grep-line-number-style", if let Some(s) = &opt.grep_line_number_style { - style_from_str(s, None, None, opt.computed.true_color) + style_from_str( + s, + None, + None, + opt.computed.true_color, + opt.git_config.as_ref(), + ) } else { StyleReference::Reference("hunk-header-line-number-style".to_owned()) }, |