From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 14 May 2012 18:41:40 +0000 (-0700)
Subject: Merge branch 'ef/maint-clone-progress-fix' into maint
X-Git-Tag: v1.7.10.3~20
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c8cf3ec7ae5e87082d18d64828f3c4f2de2eca66?hp=cb2df369804e9633f21f00be5ffb1a581955c956

Merge branch 'ef/maint-clone-progress-fix' into maint

Some time ago, "git clone" lost the progress output for its "checkout"
phase; when run without any "--quiet" option, it should give progress to
the lengthy operation.

By Erik Faye-Lund
* ef/maint-clone-progress-fix:
clone: fix progress-regression
---

diff --git a/builtin/clone.c b/builtin/clone.c
index bbd5c96237..a4d8d25ee3 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -569,7 +569,7 @@ static int checkout(void)
 	opts.update = 1;
 	opts.merge = 1;
 	opts.fn = oneway_merge;
-	opts.verbose_update = (option_verbosity > 0);
+	opts.verbose_update = (option_verbosity >= 0);
 	opts.src_index = &the_index;
 	opts.dst_index = &the_index;