git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* [PATCH] transport: respect verbosity when setting upstream
@ 2021-04-15 12:33 Øystein Walle
  2021-04-15 15:29 ` Eric Sunshine
  0 siblings, 1 reply; 4+ messages in thread
From: Øystein Walle @ 2021-04-15 12:33 UTC (permalink / raw)
  To: git; +Cc: Øystein Walle

A command such as `git push -qu origin feature` will print "Branch
'feature' set up to track remote branch 'feature' from 'origin'." even
when --quiet is passed. In this case it's because install_branch_config() is
always called with BRANCH_CONFIG_VERBOSE.

struct transport keeps track of the desired verbosity. Fix the above
issue by passing BRANCH_CONFIG_VERBOSE conditionally based on that.

Signed-off-by: Øystein Walle <oystwa@gmail.com>
---
 t/t5523-push-upstream.sh |  7 +++++++
 transport.c              | 10 +++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/t/t5523-push-upstream.sh b/t/t5523-push-upstream.sh
index 9fbe7f784d..fdb4292056 100755
--- a/t/t5523-push-upstream.sh
+++ b/t/t5523-push-upstream.sh
@@ -119,4 +119,11 @@ test_expect_success TTY 'quiet push' '
 	test_must_be_empty output
 '
 
+test_expect_success TTY 'quiet push -u' '
+	ensure_fresh_upstream &&
+
+	test_terminal git push --quiet -u --no-progress upstream main 2>&1 | tee output &&
+	test_must_be_empty output
+'
+
 test_done
diff --git a/transport.c b/transport.c
index ef66e73090..62b6eeed21 100644
--- a/transport.c
+++ b/transport.c
@@ -108,11 +108,11 @@ static void set_upstreams(struct transport *transport, struct ref *refs,
 		if (!remotename || !starts_with(remotename, "refs/heads/"))
 			continue;
 
-		if (!pretend)
-			install_branch_config(BRANCH_CONFIG_VERBOSE,
-				localname + 11, transport->remote->name,
-				remotename);
-		else
+		if (!pretend) {
+			int flag = transport->verbose < 0 ? 0 : BRANCH_CONFIG_VERBOSE;
+			install_branch_config(flag, localname + 11,
+				transport->remote->name, remotename);
+		} else if (transport->verbose >= 0)
 			printf(_("Would set upstream of '%s' to '%s' of '%s'\n"),
 				localname + 11, remotename + 11,
 				transport->remote->name);
-- 
2.20.1


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] transport: respect verbosity when setting upstream
  2021-04-15 12:33 [PATCH] transport: respect verbosity when setting upstream Øystein Walle
@ 2021-04-15 15:29 ` Eric Sunshine
  2021-04-16 13:38   ` Øystein Walle
  0 siblings, 1 reply; 4+ messages in thread
From: Eric Sunshine @ 2021-04-15 15:29 UTC (permalink / raw)
  To: Øystein Walle; +Cc: Git List

On Thu, Apr 15, 2021 at 8:34 AM Øystein Walle <oystwa@gmail.com> wrote:
> A command such as `git push -qu origin feature` will print "Branch
> 'feature' set up to track remote branch 'feature' from 'origin'." even
> when --quiet is passed. In this case it's because install_branch_config() is
> always called with BRANCH_CONFIG_VERBOSE.
>
> struct transport keeps track of the desired verbosity. Fix the above
> issue by passing BRANCH_CONFIG_VERBOSE conditionally based on that.
>
> Signed-off-by: Øystein Walle <oystwa@gmail.com>
> ---
> diff --git a/t/t5523-push-upstream.sh b/t/t5523-push-upstream.sh
> @@ -119,4 +119,11 @@ test_expect_success TTY 'quiet push' '
> +test_expect_success TTY 'quiet push -u' '
> +       ensure_fresh_upstream &&
> +
> +       test_terminal git push --quiet -u --no-progress upstream main 2>&1 | tee output &&
> +       test_must_be_empty output
> +'

I wondered why you used `tee` here since it adds no value (as far as I
can tell), but I see that you copied it from the test preceding this
one. So... [intentionally left blank]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] transport: respect verbosity when setting upstream
  2021-04-15 15:29 ` Eric Sunshine
@ 2021-04-16 13:38   ` Øystein Walle
  2021-04-16 18:48     ` Junio C Hamano
  0 siblings, 1 reply; 4+ messages in thread
From: Øystein Walle @ 2021-04-16 13:38 UTC (permalink / raw)
  To: Eric Sunshine; +Cc: Git List

On Thu, 15 Apr 2021 at 17:29, Eric Sunshine <sunshine@sunshineco.com> wrote:

> I wondered why you used `tee` here since it adds no value (as far as I
> can tell), but I see that you copied it from the test preceding this
> one. So... [intentionally left blank]

Indeed, I wondered about that too; it seems a plain redirection will do
the trick. But a mix of laziness and not second-guessing others' work made
me leave it as it is.

Øsse

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] transport: respect verbosity when setting upstream
  2021-04-16 13:38   ` Øystein Walle
@ 2021-04-16 18:48     ` Junio C Hamano
  0 siblings, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2021-04-16 18:48 UTC (permalink / raw)
  To: Øystein Walle; +Cc: Eric Sunshine, Git List

Øystein Walle <oystwa@gmail.com> writes:

> On Thu, 15 Apr 2021 at 17:29, Eric Sunshine <sunshine@sunshineco.com> wrote:
>
>> I wondered why you used `tee` here since it adds no value (as far as I
>> can tell), but I see that you copied it from the test preceding this
>> one. So... [intentionally left blank]
>
> Indeed, I wondered about that too; it seems a plain redirection will do
> the trick. But a mix of laziness and not second-guessing others' work made
> me leave it as it is.

Let's agree to mark it as #leftoverbits then?

Thanks for a fix, additional tests, and a good review.


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-04-16 18:49 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-15 12:33 [PATCH] transport: respect verbosity when setting upstream Øystein Walle
2021-04-15 15:29 ` Eric Sunshine
2021-04-16 13:38   ` Øystein Walle
2021-04-16 18:48     ` Junio C Hamano

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).