[PATCH v2 32/51] do_for_each_ref(): only iterate over the subtree that was requested
From: <hidden>
Date: 2016-06-15 22:52:36
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Michael Haggerty <redacted> If the base argument has a "/" chararacter, then only iterate over the reference subdir whose name is the part up to the last "/". Signed-off-by: Michael Haggerty <redacted> --- refs.c | 33 +++++++++++++++++++++++++++------ 1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/refs.c b/refs.c
index f01da78..6a11235 100644
--- a/refs.c
+++ b/refs.c@@ -1121,13 +1121,34 @@ static int do_for_each_ref(const char *submodule, const char *base, each_ref_fn { int retval = 0; struct ref_cache *refs = get_ref_cache(submodule); - - retval = do_for_each_ref_in_dir(&extra_refs, 0, + struct ref_dir *extra_dir = &extra_refs; + struct ref_dir *packed_dir = get_packed_refs(refs); + struct ref_dir *loose_dir = get_loose_refs(refs); + + if (base && *base) { + extra_dir = find_containing_dir(extra_dir, base, 0); + packed_dir = find_containing_dir(packed_dir, base, 0); + loose_dir = find_containing_dir(loose_dir, base, 0); + } + + if (extra_dir) + retval = do_for_each_ref_in_dir( + extra_dir, 0, + base, fn, trim, flags, cb_data); + if (!retval) { + if (packed_dir && loose_dir) + retval = do_for_each_ref_in_dirs( + packed_dir, loose_dir, + base, fn, trim, flags, cb_data); + else if (packed_dir) + retval = do_for_each_ref_in_dir( + packed_dir, 0, base, fn, trim, flags, cb_data); - if (!retval) - retval = do_for_each_ref_in_dirs(get_packed_refs(refs), - get_loose_refs(refs), - base, fn, trim, flags, cb_data); + else if (loose_dir) + retval = do_for_each_ref_in_dir( + loose_dir, 0, + base, fn, trim, flags, cb_data); + } current_ref = NULL; return retval;
--
1.7.8