diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-04-30 04:50:24 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-04-30 04:50:25 (GMT) |
| commit | a819e2b3ef7c27d04befa0a345c9e6e3c7a7965e (patch) | |
| tree | 33b1d63ea4be4c1c51a97377849b5a70025b12b3 /transport.c | |
| parent | 279a2e637a69afd6157e8287c2599e8ae5e6cb8c (diff) | |
| parent | f3cce896a8e14e4732f45a6ee46f77e7ed17a990 (diff) | |
| download | git-a819e2b3ef7c27d04befa0a345c9e6e3c7a7965e.zip git-a819e2b3ef7c27d04befa0a345c9e6e3c7a7965e.tar.gz git-a819e2b3ef7c27d04befa0a345c9e6e3c7a7965e.tar.bz2 | |
Merge branch 'ow/push-quiet-set-upstream'
"git push --quiet --set-upstream" was not quiet when setting the
upstream branch configuration, which has been corrected.
* ow/push-quiet-set-upstream:
transport: respect verbosity when setting upstream
Diffstat (limited to 'transport.c')
| -rw-r--r-- | transport.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/transport.c b/transport.c index ef66e73..62b6eee 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); |