summaryrefslogtreecommitdiff
path: root/builtin-checkout.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-23 23:37:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-23 23:42:18 (GMT)
commit52229a29c78df2e48de23ed70ab1934667971d3c (patch)
tree69213b58cc2117c0cdf0af803f133d16ddf43c33 /builtin-checkout.c
parent1736855c9b59ac787af979a44840a58361cbaf66 (diff)
downloadgit-52229a29c78df2e48de23ed70ab1934667971d3c.zip
git-52229a29c78df2e48de23ed70ab1934667971d3c.tar.gz
git-52229a29c78df2e48de23ed70ab1934667971d3c.tar.bz2
checkout: show progress when checkout takes long time while switching branches
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-checkout.c')
-rw-r--r--builtin-checkout.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin-checkout.c b/builtin-checkout.c
index 5f176c6..283831e 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;