revision: factor out add_pending_sha1

René Scharfe · gitster · commit 26c3177ee418 · 2011-10-03T11:02:56.000-07:00
This function is a combination of the static get_reference and
add_pending_object.  It can be used to easily queue objects by hash.

Signed-off-by: Rene Scharfe &lt;rene.scharfe@lsrfire.ath.cx&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/revision.c b/revision.c
@@ -185,6 +185,13 @@ static struct object *get_reference(struct rev_info *revs, const char *name, con
 	return object;
 }
 
+void add_pending_sha1(struct rev_info *revs, const char *name,
+		      const unsigned char *sha1, unsigned int flags)
+{
+	struct object *object = get_reference(revs, name, sha1, flags);
+	add_pending_object(revs, object, name);
+}
+
 static struct commit *handle_commit(struct rev_info *revs, struct object *object, const char *name)
 {
 	unsigned long flags = object->flags;
@@ -832,9 +839,7 @@ struct all_refs_cb {
 static int handle_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
 {
 	struct all_refs_cb *cb = cb_data;
-	struct object *object = get_reference(cb->all_revs, path, sha1,
-					      cb->all_flags);
-	add_pending_object(cb->all_revs, object, path);
+	add_pending_sha1(cb->all_revs, path, sha1, cb->all_flags);
 	return 0;
 }
 
diff --git a/revision.h b/revision.h
@@ -191,6 +191,7 @@ extern void add_object(struct object *obj,
 		       const char *name);
 
 extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name);
+extern void add_pending_sha1(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags);
 
 extern void add_head_to_pending(struct rev_info *);
 

Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,13 @@ static struct object get_reference(struct rev_info revs, const char *name, con`
`185`	`185`	`return object;`
`186`	`186`	`}`
`187`	`187`
	`188`	`+void add_pending_sha1(struct rev_info revs, const char name,`
	`189`	`+ const unsigned char *sha1, unsigned int flags)`
	`190`	`+{`
	`191`	`+ struct object *object = get_reference(revs, name, sha1, flags);`
	`192`	`+ add_pending_object(revs, object, name);`
	`193`	`+}`
	`194`	`+`
`188`	`195`	`static struct commit handle_commit(struct rev_info revs, struct object object, const char name)`
`189`	`196`	`{`
`190`	`197`	`unsigned long flags = object->flags;`
`@@ -832,9 +839,7 @@ struct all_refs_cb {`
`832`	`839`	`static int handle_one_ref(const char path, const unsigned char sha1, int flag, void *cb_data)`
`833`	`840`	`{`
`834`	`841`	`struct all_refs_cb *cb = cb_data;`
`835`		`- struct object *object = get_reference(cb->all_revs, path, sha1,`
`836`		`- cb->all_flags);`
`837`		`- add_pending_object(cb->all_revs, object, path);`
	`842`	`+ add_pending_sha1(cb->all_revs, path, sha1, cb->all_flags);`
`838`	`843`	`return 0;`
`839`	`844`	`}`
`840`	`845`