X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=unpack-trees.c;h=4be5fc3075410f4004b9d5fc1902eb84880dded5;hb=a08a83db2bf27f015bec9a435f6d73e223c21c5e;hp=02048dfdac8ab721b432f24a3dbcefc67f564e37;hpb=a0125885f544a670cfe5cf307a2feabba7e3bf9c;p=thirdparty%2Fgit.git

diff --git a/unpack-trees.c b/unpack-trees.c
index 02048dfdac..4be5fc3075 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;
@@ -415,7 +415,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);