Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid lockup when running without arguments and stdin is connected to a tty #1112

Merged
merged 1 commit into from
Jun 22, 2022
Merged

Avoid lockup when running without arguments and stdin is connected to a tty #1112

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,21 +136,19 @@ fn run_app() -> std::io::Result<i32> {
OutputType::from_mode(&env, config.paging_mode, config.pager.clone(), &config).unwrap();
let mut writer = output_type.handle().unwrap();

match (config.minus_file.as_ref(), config.plus_file.as_ref()) {
(None, None) => {}
(Some(minus_file), Some(plus_file)) => {
let exit_code = subcommands::diff::diff(minus_file, plus_file, &config, &mut writer);
return Ok(exit_code);
}
_ => {
eprintln!(
"\
if let (Some(minus_file), Some(plus_file)) = (&config.minus_file, &config.plus_file) {
let exit_code = subcommands::diff::diff(minus_file, plus_file, &config, &mut writer);
return Ok(exit_code);
}

if atty::is(atty::Stream::Stdin) {
eprintln!(
"\
The main way to use delta is to configure it as the pager for git: \
see https://github.com/dandavison/delta#configuration. \
You can also use delta to diff two files: `delta file_A file_B`."
);
return Ok(config.error_exit_code);
}
);
return Ok(config.error_exit_code);
}

if let Err(error) = delta(io::stdin().lock().byte_lines(), &mut writer, &config) {
Expand Down