From 7cbea6d908fddc48357a88d6edf30451c7d2b487 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 21 Oct 2021 17:17:09 +0200 Subject: Add --progress common option --- bpkg/fetch-git.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'bpkg/fetch-git.cxx') diff --git a/bpkg/fetch-git.cxx b/bpkg/fetch-git.cxx index 5c63ea2..ea6dee0 100644 --- a/bpkg/fetch-git.cxx +++ b/bpkg/fetch-git.cxx @@ -873,7 +873,7 @@ namespace bpkg if (i != repository_refs.end ()) return i->second; - if (verb && !co.no_progress ()) + if ((verb && !co.no_progress ()) || co.progress ()) text << "querying " << url; refs rs; @@ -1504,7 +1504,7 @@ namespace bpkg if (progress) { - if (verb == 1 && stderr_term) + if ((verb == 1 && stderr_term) || co.progress ()) v.push_back ("--progress"); } else @@ -1556,7 +1556,7 @@ namespace bpkg // Print progress. // - if (verb && !co.no_progress ()) + if ((verb && !co.no_progress ()) || co.progress ()) { // Note that the clone command prints the following line prior to the // progress lines: @@ -1883,7 +1883,7 @@ namespace bpkg if (u && *u == "none") { - if (verb >= 2 && !co.no_progress ()) + if ((verb >= 2 && !co.no_progress ()) || co.progress ()) text << "skipping submodule '" << psd << "'"; // Note that the submodule can be enabled for some other snapshot we @@ -1993,7 +1993,7 @@ namespace bpkg // Let's make the message match the git-submodule script output (again, // except for capitalization). // - if (verb && !co.no_progress ()) + if ((verb && !co.no_progress ()) || co.progress ()) text << "submodule path '" << psd << "': checked out '" << sm.commit << "'"; -- cgit v1.1