From 03af61fc7bb384cb594359fee806912ee5e57a98 Mon Sep 17 00:00:00 2001 From: Andrew Gallant Date: Sun, 22 Jul 2018 10:57:33 -0400 Subject: [PATCH] ripgrep: don't skip tar archives This removes logic from the decompressor for skipping tar archives. This logic was originally added under the assumption that we probably want to avoid the cost of reading them. However, this is generally inconsistent with how ripgrep treats files like tar archives: it should search them and do binary detection like normal. Fixes #918 --- CHANGELOG.md | 2 ++ src/decompressor.rs | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 987547a..c5ee469 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -84,6 +84,8 @@ Bug fixes: Upgrade `grep` crate to `regex-syntax 0.5.0`. * [BUG #893](https://github.com/BurntSushi/ripgrep/issues/893): Improve support for git submodules. +* [BUG #918](https://github.com/BurntSushi/ripgrep/issues/918): + Don't skip tar archives when `-z/--search-zip` is used. * [BUG #934](https://github.com/BurntSushi/ripgrep/issues/934): Don't respect gitignore files when searching outside git repositories. * [BUG #948](https://github.com/BurntSushi/ripgrep/issues/948): diff --git a/src/decompressor.rs b/src/decompressor.rs index 235849b..d25c2f5 100644 --- a/src/decompressor.rs +++ b/src/decompressor.rs @@ -92,10 +92,6 @@ impl DecompressionReader { /// If there is any error in spawning the decompression command, then /// return `None`, after outputting any necessary debug or error messages. pub fn from_path(path: &Path) -> Option { - if is_tar_archive(path) { - debug!("{}: skipping tar archive", path.display()); - return None; - } let extension = match path.extension().and_then(OsStr::to_str) { Some(extension) => extension, None => {