From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 23 Feb 2008 23:37:48 +0000 (-0800)
Subject: checkout: show progress when checkout takes long time while switching branches
X-Git-Tag: v1.5.5-rc0~133^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=52229a29c78df2e48de23ed70ab1934667971d3c;p=git.git

checkout: show progress when checkout takes long time while switching branches

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin-checkout.c b/builtin-checkout.c
index 5f176c6c3..283831e8a 100644
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -232,6 +232,7 @@ static int merge_working_tree(struct checkout_opts *opts,
 			topts.update = 1;
 			topts.merge = 1;
 			topts.gently = opts->merge;
+			topts.verbose_update = !opts->quiet;
 			topts.fn = twoway_merge;
 			topts.dir = xcalloc(1, sizeof(*topts.dir));
 			topts.dir->show_ignored = 1;