diff options
| author | Andrew Gallant <jamslam@gmail.com> | 2018-07-22 10:57:33 -0400 |
|---|---|---|
| committer | Andrew Gallant <jamslam@gmail.com> | 2018-07-22 10:59:09 -0400 |
| commit | 03af61fc7bb384cb594359fee806912ee5e57a98 (patch) | |
| tree | 725836b193877d35c20c16e9d1920aa813750950 | |
| parent | 560dffd2476f16b4b296aae6aca7aec0f0c6ba1c (diff) | |
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
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | src/decompressor.rs | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 987547aa..c5ee469a 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 235849b7..d25c2f56 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<DecompressionReader> { - 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 => { |