Merge branch 'rs/unpack-trees-reduce-file-scope-global'

gitster · gitster · commit e9c6d3dcc211 · 2016-09-21T15:15:26.000-07:00
Code cleanup.

* rs/unpack-trees-reduce-file-scope-global:
  unpack-trees: pass checkout state explicitly to check_updates()
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -218,8 +218,8 @@ static void unlink_entry(const struct cache_entry *ce)`
`218`	`218`	`schedule_dir_for_removal(ce->name, ce_namelen(ce));`
`219`	`219`	`}`
`220`	`220`
`221`		`-static struct checkout state;`
`222`		`-static int check_updates(struct unpack_trees_options *o)`
	`221`	`+static int check_updates(struct unpack_trees_options *o,`
	`222`	`+ const struct checkout *state)`
`223`	`223`	`{`
`224`	`224`	`unsigned cnt = 0, total = 0;`
`225`	`225`	`struct progress *progress = NULL;`
`@@ -264,7 +264,7 @@ static int check_updates(struct unpack_trees_options *o)`
`264`	`264`	`display_progress(progress, ++cnt);`
`265`	`265`	`ce->ce_flags &= ~CE_UPDATE;`
`266`	`266`	`if (o->update && !o->dry_run) {`
`267`		`- errs \|= checkout_entry(ce, &state, NULL);`
	`267`	`+ errs \|= checkout_entry(ce, state, NULL);`
`268`	`268`	`}`
`269`	`269`	`}`
`270`	`270`	`}`
`@@ -1094,6 +1094,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options`
`1094`	`1094`	`int i, ret;`
`1095`	`1095`	`static struct cache_entry *dfc;`
`1096`	`1096`	`struct exclude_list el;`
	`1097`	`+ struct checkout state;`
`1097`	`1098`
`1098`	`1099`	`if (len > MAX_UNPACK_TREES)`
`1099`	`1100`	`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`
`1239`	`1240`	`}`
`1240`	`1241`
`1241`	`1242`	`o->src_index = NULL;`
`1242`		`- ret = check_updates(o) ? (-2) : 0;`
	`1243`	`+ ret = check_updates(o, &state) ? (-2) : 0;`
`1243`	`1244`	`if (o->dst_index) {`
`1244`	`1245`	`if (!ret) {`
`1245`	`1246`	`if (!o->result.cache_tree)`