[PATCH 3/6] Extract a function do_for_each_extra_ref()

[mhagger@alum.mit.edu]

From: Michael Haggerty <mhagger@alum.mit.edu>

We want to hold the extra refs at arms length.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
 refs.c |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/refs.c b/refs.c
index 6115487..268bda9 100644
--- a/refs.c
+++ b/refs.c
@@ -693,17 +693,28 @@ fallback:
 	return -1;
 }
 
+static int do_for_each_extra_ref(const char *base, each_ref_fn fn,
+				 int trim, int flags, void *cb_data)
+{
+	int i;
+	for (i = 0; i < extra_refs.nr; i++) {
+		int retval = do_one_ref(base, fn, trim, flags, cb_data, extra_refs.refs[i]);
+		if (retval)
+			return retval;
+	}
+	return 0;
+}
+
 static int do_for_each_ref(const char *submodule, const char *base, each_ref_fn fn,
 			   int trim, int flags, void *cb_data)
 {
-	int retval = 0, i, p = 0, l = 0;
+	int retval = 0, p = 0, l = 0;
 	struct ref_array *packed = get_packed_refs(submodule);
 	struct ref_array *loose = get_loose_refs(submodule);
 
-	struct ref_array *extra = &extra_refs;
-
-	for (i = 0; i < extra->nr; i++)
-		retval = do_one_ref(base, fn, trim, flags, cb_data, extra->refs[i]);
+	retval = do_for_each_extra_ref(base, fn, trim, flags, cb_data);
+	if (retval)
+		goto end_each;
 
 	while (p < packed->nr && l < loose->nr) {
 		struct ref_entry *entry;
-- 
1.7.8