undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do_for_each_ref(): only iterate over the subtree that was requested

Browse Source 
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>
This commit is contained in:
Michael Haggerty 2012-04-10 07:30:27 +02:00 committed by Junio C Hamano
parent 432ad41e60
commit 933ac036d2
1 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
refs.c
View File

@ -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) int trim, int flags, void *cb_data)
{ {
struct ref_cache *refs = get_ref_cache(submodule); struct ref_cache *refs = get_ref_cache(submodule);
struct ref_dir *packed_refs = get_packed_refs(refs); struct ref_dir *packed_dir = get_packed_refs(refs);
struct ref_dir *loose_refs = get_loose_refs(refs); struct ref_dir *loose_dir = get_loose_refs(refs);
sort_ref_dir(packed_refs); int retval = 0;
sort_ref_dir(loose_refs);
return do_for_each_ref_in_dirs(packed_refs, if (base && *base) {
loose_refs, packed_dir = find_containing_dir(packed_dir, base, 0);
base, fn, trim, flags, cb_data); 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) static int do_head_ref(const char *submodule, each_ref_fn fn, void *cb_data)