MirroredRepos/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-09-02 19:32:25 +01:00
Code Issues Releases Wiki Activity

Skip non-file inputs when using --diff

Browse Source
This commit is contained in:
sharkdp
2020-04-24 16:06:04 +02:00
committed by David Peter
parent 8e18786556
commit 23afc8e90c
3 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/controller.rs
View File

@@ -73,26 +73,30 @@ impl<'b> Controller<'b> {
}
Ok(mut opened_input) => {
#[cfg(feature = "git")]
let line_changes = if self.config.visible_lines.diff_context()
let line_changes = if self.config.visible_lines.diff_mode()
|| (!self.config.loop_through && self.config.style_components.changes())
{
if let crate::input::OpenedInputKind::OrdinaryFile(ref path) =
opened_input.kind
{
let diff = get_git_diff(path);
match opened_input.kind {
crate::input::OpenedInputKind::OrdinaryFile(ref path) => {
let diff = get_git_diff(path);
if self.config.visible_lines.diff_context()
&& diff
.as_ref()
.map(|changes| changes.is_empty())
.unwrap_or(false)
{
// Skip files without Git modifications
if self.config.visible_lines.diff_mode()
&& diff
.as_ref()
.map(|changes| changes.is_empty())
.unwrap_or(false)
{
continue;
}
diff
}
_ if self.config.visible_lines.diff_mode() => {
// Skip non-file inputs in diff mode
continue;
}
diff
} else {
None
_ => None,
}
} else {
None
@@ -134,7 +138,7 @@ impl<'b> Controller<'b> {
printer: &mut dyn Printer,
writer: &mut dyn Write,
input: &mut OpenedInput,
#[cfg(feature = "git")] line_changes: &Option<LineChanges>,
line_changes: &Option<LineChanges>,
) -> Result<()> {
if !input.reader.first_line.is_empty() || self.config.style_components.header() {
printer.print_header(writer, input)?;