revision.c: refactor add_index_objects_to_pending()

pclouds · gitster · commit 6c3d818154eb · 2017-08-24T14:42:45.000-07:00
The core code is factored out and take 'struct index_state *' instead so
that we can reuse it to add objects from index files other than .git/index
in the next patch.

Signed-off-by: Nguyễn Thái Ngọc Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/revision.c b/revision.c
@@ -1262,13 +1262,13 @@ static void add_cache_tree(struct cache_tree *it, struct rev_info *revs,
 
 }
 
-void add_index_objects_to_pending(struct rev_info *revs, unsigned flags)
+static void do_add_index_objects_to_pending(struct rev_info *revs,
+					    struct index_state *istate)
 {
 	int i;
 
-	read_cache();
-	for (i = 0; i < active_nr; i++) {
-		struct cache_entry *ce = active_cache[i];
+	for (i = 0; i < istate->cache_nr; i++) {
+		struct cache_entry *ce = istate->cache[i];
 		struct blob *blob;
 
 		if (S_ISGITLINK(ce->ce_mode))
@@ -1281,13 +1281,19 @@ void add_index_objects_to_pending(struct rev_info *revs, unsigned flags)
 					     ce->ce_mode, ce->name);
 	}
 
-	if (active_cache_tree) {
+	if (istate->cache_tree) {
 		struct strbuf path = STRBUF_INIT;
-		add_cache_tree(active_cache_tree, revs, &path);
+		add_cache_tree(istate->cache_tree, revs, &path);
 		strbuf_release(&path);
 	}
 }
 
+void add_index_objects_to_pending(struct rev_info *revs, unsigned int flags)
+{
+	read_cache();
+	do_add_index_objects_to_pending(revs, &the_index);
+}
+
 static int add_parents_only(struct rev_info *revs, const char *arg_, int flags,
 			    int exclude_parent)
 {

Original file line number	Diff line number	Diff line change
`@@ -1262,13 +1262,13 @@ static void add_cache_tree(struct cache_tree it, struct rev_info revs,`
`1262`	`1262`
`1263`	`1263`	`}`
`1264`	`1264`
`1265`		`-void add_index_objects_to_pending(struct rev_info *revs, unsigned flags)`
	`1265`	`+static void do_add_index_objects_to_pending(struct rev_info *revs,`
	`1266`	`+ struct index_state *istate)`
`1266`	`1267`	`{`
`1267`	`1268`	`int i;`
`1268`	`1269`
`1269`		`- read_cache();`
`1270`		`- for (i = 0; i < active_nr; i++) {`
`1271`		`- struct cache_entry *ce = active_cache[i];`
	`1270`	`+ for (i = 0; i < istate->cache_nr; i++) {`
	`1271`	`+ struct cache_entry *ce = istate->cache[i];`
`1272`	`1272`	`struct blob *blob;`
`1273`	`1273`
`1274`	`1274`	`if (S_ISGITLINK(ce->ce_mode))`
`@@ -1281,13 +1281,19 @@ void add_index_objects_to_pending(struct rev_info *revs, unsigned flags)`
`1281`	`1281`	`ce->ce_mode, ce->name);`
`1282`	`1282`	`}`
`1283`	`1283`
`1284`		`- if (active_cache_tree) {`
	`1284`	`+ if (istate->cache_tree) {`
`1285`	`1285`	`struct strbuf path = STRBUF_INIT;`
`1286`		`- add_cache_tree(active_cache_tree, revs, &path);`
	`1286`	`+ add_cache_tree(istate->cache_tree, revs, &path);`
`1287`	`1287`	`strbuf_release(&path);`
`1288`	`1288`	`}`
`1289`	`1289`	`}`
`1290`	`1290`
	`1291`	`+void add_index_objects_to_pending(struct rev_info *revs, unsigned int flags)`
	`1292`	`+{`
	`1293`	`+ read_cache();`
	`1294`	`+ do_add_index_objects_to_pending(revs, &the_index);`
	`1295`	`+}`
	`1296`	`+`
`1291`	`1297`	`static int add_parents_only(struct rev_info revs, const char arg_, int flags,`
`1292`	`1298`	`int exclude_parent)`
`1293`	`1299`	`{`