From: Elijah Newren Date: Thu, 14 May 2020 19:53:22 +0000 (+0000) Subject: unpack-trees: also allow get_progress() to work on a different index X-Git-Tag: v2.27.0-rc1~4^2 X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=6c34239de67e03390622dfad14d91ed3ce1048b5 unpack-trees: also allow get_progress() to work on a different index commit b0a5a12a60 ("unpack-trees: allow check_updates() to work on a different index", 2020-03-27) allowed check_updates() to work on a different index, but it called get_progress() which was hardcoded to work on o->result much like check_updates() had been. Update it to also accept an index parameter and have check_updates() pass that parameter along so that both are working on the same index. Noticed-by: Jeff Hostetler Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- diff --git a/unpack-trees.c b/unpack-trees.c index b43f3e775a..8caf5e8ecc 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -333,10 +333,10 @@ static void load_gitmodules_file(struct index_state *index, } } -static struct progress *get_progress(struct unpack_trees_options *o) +static struct progress *get_progress(struct unpack_trees_options *o, + struct index_state *index) { unsigned cnt = 0, total = 0; - struct index_state *index = &o->result; if (!o->update || !o->verbose_update) return NULL; @@ -414,7 +414,7 @@ static int check_updates(struct unpack_trees_options *o, if (o->clone) setup_collided_checkout_detection(&state, index); - progress = get_progress(o); + progress = get_progress(o, index); git_attr_set_direction(GIT_ATTR_CHECKOUT);