Skip to content

Commit

Permalink
do_for_each_ref(): only iterate over the subtree that was requested
Browse files Browse the repository at this point in the history
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 <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Michael Haggerty authored and Junio C Hamano committed Apr 10, 2012
1 parent 432ad41 commit 933ac03
Showing 1 changed file with 28 additions and 7 deletions.
35 changes: 28 additions & 7 deletions refs.c
Original file line number Diff line number Diff line change
Expand Up @@ -1143,13 +1143,34 @@ static int do_for_each_ref(const char *submodule, const char *base, each_ref_fn
int trim, int flags, void *cb_data)
{
struct ref_cache *refs = get_ref_cache(submodule);
struct ref_dir *packed_refs = get_packed_refs(refs);
struct ref_dir *loose_refs = get_loose_refs(refs);
sort_ref_dir(packed_refs);
sort_ref_dir(loose_refs);
return do_for_each_ref_in_dirs(packed_refs,
loose_refs,
base, fn, trim, flags, cb_data);
struct ref_dir *packed_dir = get_packed_refs(refs);
struct ref_dir *loose_dir = get_loose_refs(refs);
int retval = 0;

if (base && *base) {
packed_dir = find_containing_dir(packed_dir, base, 0);
loose_dir = find_containing_dir(loose_dir, base, 0);
}

if (packed_dir && loose_dir) {
sort_ref_dir(packed_dir);
sort_ref_dir(loose_dir);
retval = do_for_each_ref_in_dirs(
packed_dir, loose_dir,
base, fn, trim, flags, cb_data);
} else if (packed_dir) {
sort_ref_dir(packed_dir);
retval = do_for_each_ref_in_dir(
packed_dir, 0,
base, fn, trim, flags, cb_data);
} else if (loose_dir) {
sort_ref_dir(loose_dir);
retval = do_for_each_ref_in_dir(
loose_dir, 0,
base, fn, trim, flags, cb_data);
}

return retval;
}

static int do_head_ref(const char *submodule, each_ref_fn fn, void *cb_data)
Expand Down

0 comments on commit 933ac03

Please sign in to comment.