From 829897fa2e7789013b7a20abc381f290e8045aca Mon Sep 17 00:00:00 2001 From: sarankumar1325 <120080287+sarankumar1325@users.noreply.github.com> Date: Wed, 11 Nov 2026 01:51:03 +0530 Subject: [PATCH] diff: color --color=auto output when TERM is unset Only TERM=dumb disables colors in auto mode now, like GNU diff. An unset TERM (env -i, service managers, minimal containers) no longer turns colors off on a terminal. Fixes #352 --- src/diff.rs | 2 +- tests/by-util/test_diff.rs | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/diff.rs b/src/diff.rs index 2cc546cf..7de5f55c 100644 --- a/src/diff.rs +++ b/src/diff.rs @@ -226,7 +226,7 @@ fn output_palette(params: &Params) -> Option { ColorWhen::Always => true, ColorWhen::Auto => { (params.presume_output_tty || stdout().is_terminal()) - && std::env::var_os("TERM").is_some_and(|term| term != "dumb") + && std::env::var_os("TERM").is_none_or(|term| term != "dumb") } }; if !enabled { diff --git a/tests/by-util/test_diff.rs b/tests/by-util/test_diff.rs index 2f5b5dd9..463090a2 100644 --- a/tests/by-util/test_diff.rs +++ b/tests/by-util/test_diff.rs @@ -477,6 +477,18 @@ fn color() -> Result<(), Box> { .stdout("2c2\n< rain\n---\n> snow\n"); } + // Like GNU diff, an unset TERM does not disable --color=auto on a terminal. + let mut cmd = cargo_bin_cmd!("diffutils"); + cmd.env_remove("TERM") + .arg("diff") + .arg("--color=auto") + .arg("---presume-output-tty") + .arg(&old) + .arg(&new); + cmd.assert() + .code(predicate::eq(1)) + .stdout("\x1b[36m2c2\x1b[0m\n\x1b[31m< rain\x1b[0m\n---\n\x1b[32m> snow\x1b[0m\n"); + // An invalid palette is reported and disables colors. let mut cmd = cargo_bin_cmd!("diffutils"); cmd.arg("diff")