summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2010-09-02 11:57:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-09-03 16:31:41 (GMT)
commite294030fe89efcdd92430b60cf9568ffbe7317a8 (patch)
tree574bbe6ed9e41ae61f130ba476f24da6b3847415 /builtin/checkout.c
parentdc1166e685dc54946ea4600e962e56a965962ec2 (diff)
downloadgit-e294030fe89efcdd92430b60cf9568ffbe7317a8.zip
git-e294030fe89efcdd92430b60cf9568ffbe7317a8.tar.gz
git-e294030fe89efcdd92430b60cf9568ffbe7317a8.tar.bz2
setup_unpack_trees_porcelain: take the whole options struct as parameter
This is a preparation patch to let setup_unpack_trees_porcelain set show_all_errors itself. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/checkout.c')
-rw-r--r--builtin/checkout.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 00cd164..f6caac1 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -373,7 +373,7 @@ static int merge_working_tree(struct checkout_opts *opts,
topts.src_index = &the_index;
topts.dst_index = &the_index;
- setup_unpack_trees_porcelain(topts.msgs, "checkout");
+ setup_unpack_trees_porcelain(&topts, "checkout");
refresh_cache(REFRESH_QUIET);