mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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
This commit is contained in:
commit
a819e2b3ef
|
@ -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
|
||||
|
|
10
transport.c
10
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);
|
||||
|
|
Loading…
Reference in a new issue