opensourcemirror
/
git
mirror of https://github.com/git/git.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'en/sparse-checkout' 

Consistency fix to a topic already in 'master'.

* en/sparse-checkout:
  unpack-trees: also allow get_progress() to work on a different index
This commit is contained in:
Junio C Hamano 2020-05-20 08:33:29 -07:00
parent 85d6e28a62 6c34239de6
commit fde4622c08
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
unpack-trees.c
View File

@ -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);