Skip to content

fix(git): Hide git fetch output without progress #17243

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

Merged
weihanglo merged 7 commits into from
Jul 21, 2026
Merged

fix(git): Hide git fetch output without progress #17243

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6839697
refactor(progress): Group related ProgressWhen::Auto logic
epage Jul 20, 2026
9264318
refactor(progress): Consolidate Progress constructor calls
epage Jul 20, 2026
210e2fa
refactor(progress): Pull out progress detection
epage Jul 20, 2026
37b81df
refactor(progress): Bypass config for TERM
epage Jul 20, 2026
e57e7cf
refactor(progress): Lazily read TERM
epage Jul 20, 2026
50c3d37
refactor(progress): Pull out detection into Shell
epage Jul 20, 2026
8f51c1c
fix(git): Hide `git fetch` output without progress
epage Jul 20, 2026
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
28 changes: 19 additions & 9 deletions src/util/progress.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,23 +56,33 @@ impl<'gctx> Progress<'gctx> {
style: ProgressStyle,
gctx: &'gctx GlobalContext,
) -> Progress<'gctx> {
let progress_config = gctx.progress_config();
let progress = match progress_config.when {
ProgressWhen::Always => true,
ProgressWhen::Never => false,
ProgressWhen::Auto => Self::progress_supported(gctx),
};
if progress {
Progress::new_priv(name, style, gctx)
} else {
return Progress { gctx, state: None };
}
}

fn progress_supported(gctx: &'gctx GlobalContext) -> bool {
// report no progress when -q (for quiet) or TERM=dumb are set
// or if running on Continuous Integration service like Travis where the
// output logs get mangled.
let dumb = match gctx.get_env("TERM") {
#[allow(clippy::disallowed_methods, reason = "not a cargo env")]
let dumb = match std::env::var("TERM") {
Comment on lines +76 to +77

@weihanglo weihanglo Jul 21, 2026 •
edited by rustbot
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can think of "TERM" as a cargo env in disguise. Anyway, I don't think it matter and I got why you did this change first.

View changes since the review

Ok(term) => term == "dumb",
Err(_) => false,
};
let progress_config = gctx.progress_config();
match progress_config.when {
ProgressWhen::Always => return Progress::new_priv(name, style, gctx),
ProgressWhen::Never => return Progress { gctx, state: None },
ProgressWhen::Auto => {}
}
if gctx.shell().verbosity() == Verbosity::Quiet || dumb || is_ci() {
return Progress { gctx, state: None };
false
} else {
true
}
Progress::new_priv(name, style, gctx)
}

fn new_priv(name: &str, style: ProgressStyle, gctx: &'gctx GlobalContext) -> Progress<'gctx> {
Expand Down