Skip to content

Commit 4a242d6

Browse files
committed
Merge branch 'jk/maint-push-v-is-verbose' into maint
* jk/maint-push-v-is-verbose: make "git push -v" actually verbose
2 parents b5c1279 + bd2c86e commit 4a242d6

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

transport.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ static struct ref *get_refs_via_rsync(struct transport *transport, int for_push)
215215
rsync.argv = args;
216216
rsync.stdout_to_stderr = 1;
217217
args[0] = "rsync";
218-
args[1] = (transport->verbose > 0) ? "-rv" : "-r";
218+
args[1] = (transport->verbose > 1) ? "-rv" : "-r";
219219
args[2] = buf.buf;
220220
args[3] = temp_dir.buf;
221221
args[4] = NULL;
@@ -268,7 +268,7 @@ static int fetch_objs_via_rsync(struct transport *transport,
268268
rsync.argv = args;
269269
rsync.stdout_to_stderr = 1;
270270
args[0] = "rsync";
271-
args[1] = (transport->verbose > 0) ? "-rv" : "-r";
271+
args[1] = (transport->verbose > 1) ? "-rv" : "-r";
272272
args[2] = "--ignore-existing";
273273
args[3] = "--exclude";
274274
args[4] = "info";
@@ -351,7 +351,7 @@ static int rsync_transport_push(struct transport *transport,
351351
args[i++] = "-a";
352352
if (flags & TRANSPORT_PUSH_DRY_RUN)
353353
args[i++] = "--dry-run";
354-
if (transport->verbose > 0)
354+
if (transport->verbose > 1)
355355
args[i++] = "-v";
356356
args[i++] = "--ignore-existing";
357357
args[i++] = "--exclude";
@@ -527,7 +527,7 @@ static int fetch_refs_via_pack(struct transport *transport,
527527
args.lock_pack = 1;
528528
args.use_thin_pack = data->options.thin;
529529
args.include_tag = data->options.followtags;
530-
args.verbose = (transport->verbose > 0);
530+
args.verbose = (transport->verbose > 1);
531531
args.quiet = (transport->verbose < 0);
532532
args.no_progress = !transport->progress;
533533
args.depth = data->options.depth;
@@ -980,7 +980,7 @@ int transport_set_option(struct transport *transport,
980980
void transport_set_verbosity(struct transport *transport, int verbosity,
981981
int force_progress)
982982
{
983-
if (verbosity >= 2)
983+
if (verbosity >= 1)
984984
transport->verbose = verbosity <= 3 ? verbosity : 3;
985985
if (verbosity < 0)
986986
transport->verbose = -1;

0 commit comments

Comments
 (0)