Add --no-git option

README.md

@@ -77,6 +77,7 @@ These options are available when running with `--long` (`-l`):
 - **-@**, **--extended**: list each file’s extended attributes and sizes
 - **--changed**: use the changed timestamp field
 - **--git**: list each file’s Git status, if tracked or ignored
+- **--no-git**: don't list Git status (always overrides --git)
 - **--time-style**: how to format timestamps
 - **--no-permissions**: suppress the permissions field
 - **--octal-permissions**: list each file's permission in octal format

completions/fish/exa.fish

@@ -88,4 +88,5 @@ complete -c exa -l 'no-time' -d "Suppress the time field"
 
 # Optional extras
 complete -c exa -l 'git' -d "List each file's Git status, if tracked"
+complete -c exa -l 'no-git' -d "Don't list Git status"
 complete -c exa -s '@' -l 'extended' -d "List each file's extended attributes and sizes"

completions/zsh/_exa

@@ -52,6 +52,7 @@ __exa() {
  {-u,--accessed}"[Use the accessed timestamp field]" \
  {-U,--created}"[Use the created timestamp field]" \
  --git"[List each file's Git status, if tracked]" \
+ --no-git"[Don't list Git status]" \
  {-@,--extended}"[List each file's extended attributes and sizes]" \
  '*:filename:_files'
 }

man/exa.1.md

@@ -187,6 +187,9 @@ This adds a two-character column indicating the staged and unstaged statuses res
 
 Directories will be shown to have the status of their contents, which is how ‘deleted’ is possible: if a directory contains a file that has a certain status, it will be shown to have that status.
 
+`--no-git` [if exa was built with git support]
+: Don't list Git status. (Always overrides --git)
+
 
 ENVIRONMENT VARIABLES
 =====================

src/options/flags.rs

@@ -63,6 +63,7 @@ pub static NO_ICONS: Arg = Arg { short: None, long: "no-icons", takes_value: Tak
 
 // optional feature options
 pub static GIT: Arg = Arg { short: None, long: "git", takes_value: TakesValue::Forbidden };
+pub static NO_GIT: Arg = Arg { short: None, long: "no-git", takes_value: TakesValue::Forbidden };
 pub static EXTENDED: Arg = Arg { short: Some(b'@'), long: "extended", takes_value: TakesValue::Forbidden };
 pub static OCTAL: Arg = Arg { short: None, long: "octal-permissions", takes_value: TakesValue::Forbidden };
 
@@ -80,5 +81,5 @@ pub static ALL_ARGS: Args = Args(&[
  &BLOCKS, &TIME, &ACCESSED, &CREATED, &TIME_STYLE,
  &NO_PERMISSIONS, &NO_FILESIZE, &NO_USER, &NO_TIME, &NO_ICONS,
 
- &GIT, &EXTENDED, &OCTAL
+ &GIT, &NO_GIT, &EXTENDED, &OCTAL
 ]);

src/options/help.rs

@@ -61,9 +61,10 @@ LONG VIEW OPTIONS
  --no-user suppress the user field
  --no-time suppress the time field";
 
-static GIT_FILTER_HELP: &str = " --git-ignore ignore files mentioned in '.gitignore'";
-static GIT_VIEW_HELP: &str = " --git list each file's Git status, if tracked or ignored";
-static EXTENDED_HELP: &str = " -@, --extended list each file's extended attributes and sizes";
+static GIT_FILTER_HELP: &str = " --git-ignore ignore files mentioned in '.gitignore'";
+static GIT_VIEW_HELP: &str = " --git list each file's Git status, if tracked or ignored";
+static NO_GIT_VIEW_HELP: &str = " --no-git don't list Git status (always overrides --git)";
+static EXTENDED_HELP: &str = " -@, --extended list each file's extended attributes and sizes";
 
 
 /// All the information needed to display the help text, which depends
@@ -106,6 +107,7 @@ impl fmt::Display for HelpString {
 
  if cfg!(feature = "git") {
  write!(f, "\n{}", GIT_VIEW_HELP)?;
+ write!(f, "\n{}", NO_GIT_VIEW_HELP)?;
  }
 
  if xattr::ENABLED {

src/options/view.rs

@@ -199,7 +199,7 @@ impl TableOptions {
 impl Columns {
  fn deduce(matches: &MatchedFlags<'_>) -> Result<Self, OptionsError> {
  let time_types = TimeTypes::deduce(matches)?;
- let git = matches.has(&flags::GIT)?;
+ let git = matches.has(&flags::GIT)? && !matches.has(&flags::NO_GIT)?;
 
  let blocks = matches.has(&flags::BLOCKS)?;
  let group = matches.has(&flags::GROUP)?;
@@ -357,8 +357,8 @@ mod test {
 
  static TEST_ARGS: &[&Arg] = &[ &flags::BINARY, &flags::BYTES, &flags::TIME_STYLE,
  &flags::TIME, &flags::MODIFIED, &flags::CHANGED,
- &flags::CREATED, &flags::ACCESSED,
- &flags::HEADER, &flags::GROUP, &flags::INODE, &flags::GIT,
+ &flags::CREATED, &flags::ACCESSED, &flags::HEADER,
+ &flags::GROUP, &flags::INODE, &flags::GIT, &flags::NO_GIT,
  &flags::LINKS, &flags::BLOCKS, &flags::LONG, &flags::LEVEL,
  &flags::GRID, &flags::ACROSS, &flags::ONE_LINE, &flags::TREE,
  &flags::NUMERIC ];

xtests/outputs/help.ansitxt

@@ -53,4 +53,5 @@ LONG VIEW OPTIONS
  --no-user suppress the user field
  --no-time suppress the time field
  --git list each file's Git status, if tracked or ignored
+ --no-git don't list Git status (always overrides --git)
  -@, --extended list each file's extended attributes and sizes