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 5f176c6c38465393f22c0e50be76914ac0e90921..283831e8af93ede033bfe8eb27ae609e31638051 100644 (file)
--- 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;