summaryrefslogtreecommitdiff
path: root/unpack-trees.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-09-21 22:15:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-09-21 22:15:26 (GMT)
commite9c6d3dcc2112f0d6190681211ea76b714fcd704 (patch)
treeca7f98f1c85413f858831050adc08bc07755fc23 /unpack-trees.c
parent3ba0bbb901c6fdb092944bced927a10a1ed25bf5 (diff)
parentb56aa5b268ee2188c3dee27cc94025f4c647594a (diff)
downloadgit-e9c6d3dcc2112f0d6190681211ea76b714fcd704.zip
git-e9c6d3dcc2112f0d6190681211ea76b714fcd704.tar.gz
git-e9c6d3dcc2112f0d6190681211ea76b714fcd704.tar.bz2
Merge branch 'rs/unpack-trees-reduce-file-scope-global'
Code cleanup. * rs/unpack-trees-reduce-file-scope-global: unpack-trees: pass checkout state explicitly to check_updates()
Diffstat (limited to 'unpack-trees.c')
-rw-r--r--unpack-trees.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/unpack-trees.c b/unpack-trees.c
index 8851691..3db3f02 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -218,8 +218,8 @@ static void unlink_entry(const struct cache_entry *ce)
schedule_dir_for_removal(ce->name, ce_namelen(ce));
}
-static struct checkout state;
-static int check_updates(struct unpack_trees_options *o)
+static int check_updates(struct unpack_trees_options *o,
+ const struct checkout *state)
{
unsigned cnt = 0, total = 0;
struct progress *progress = NULL;
@@ -264,7 +264,7 @@ static int check_updates(struct unpack_trees_options *o)
display_progress(progress, ++cnt);
ce->ce_flags &= ~CE_UPDATE;
if (o->update && !o->dry_run) {
- errs |= checkout_entry(ce, &state, NULL);
+ errs |= checkout_entry(ce, state, NULL);
}
}
}
@@ -1094,6 +1094,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
int i, ret;
static struct cache_entry *dfc;
struct exclude_list el;
+ struct checkout state;
if (len > MAX_UNPACK_TREES)
die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES);
@@ -1239,7 +1240,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
}
o->src_index = NULL;
- ret = check_updates(o) ? (-2) : 0;
+ ret = check_updates(o, &state) ? (-2) : 0;
if (o->dst_index) {
if (!ret) {
if (!o->result.cache_tree)