Drop grep-header-style option

dandavison · Jun 3, 2023 · 3819e94 · 3819e94
1 parent a28231a
commit 3819e94
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 16 deletions.
diff --git a/manual/src/full---help-output.md b/manual/src/full---help-output.md
@@ -187,11 +187,6 @@ Options:
 
           See hunk_header_file_style.
 
-      --grep-header-style <STYLE>
-          Style string for the header in grep output.
-
-          See hunk-header-style.
-
       --grep-line-number-style <STYLE>
           Style string for line numbers in grep output.
 

diff --git a/src/cli.rs b/src/cli.rs
@@ -419,12 +419,6 @@ pub struct Opt {
     /// See hunk_header_file_style.
     pub grep_header_file_style: Option<String>,
 
-    #[arg(long = "grep-header-style", value_name = "STYLE")]
-    /// Style string for the header in grep output.
-    ///
-    /// See hunk-header-style.
-    pub grep_header_style: Option<String>,
-
     #[arg(
         long = "grep-line-number-style",
         default_value = "green",

diff --git a/src/options/set.rs b/src/options/set.rs
@@ -154,7 +154,6 @@ pub fn set_options(
             grep_file_style,
             grep_header_decoration_style,
             grep_header_file_style,
-            grep_header_style,
             grep_output_type,
             grep_line_number_style,
             grep_match_line_style,

diff --git a/src/parse_styles.rs b/src/parse_styles.rs
@@ -325,9 +325,7 @@ fn make_commit_file_hunk_header_styles(opt: &cli::Opt, styles: &mut HashMap<&str
         (
             "classic-grep-header-style",
             style_from_str_with_handling_of_special_decoration_attributes(
-                opt.grep_header_style
-                    .as_deref()
-                    .unwrap_or(opt.hunk_header_style.as_str()),
+                opt.hunk_header_style.as_str(),
                 None,
                 opt.grep_header_decoration_style
                     .as_deref()
@@ -339,7 +337,7 @@ fn make_commit_file_hunk_header_styles(opt: &cli::Opt, styles: &mut HashMap<&str
         (
             "ripgrep-header-style",
             style_from_str_with_handling_of_special_decoration_attributes(
-                opt.grep_header_style.as_deref().unwrap_or("file"),
+                "file",
                 None,
                 opt.grep_header_decoration_style.as_deref().or(Some("none")),
                 true_color,