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

refs: manage current_ref within do_one_ref()

Browse Source 
Set and clear current_ref within do_one_ref() instead of setting it
here and leaving it to somebody else to clear it.

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:14 +02:00 committed by Junio C Hamano
parent bc5fd6d3c2
commit 429213e470
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
refs.c
View File

@ -250,6 +250,7 @@ static struct ref_entry *current_ref;
static int do_one_ref(const char *base, each_ref_fn fn, int trim, static int do_one_ref(const char *base, each_ref_fn fn, int trim,
int flags, void *cb_data, struct ref_entry *entry) int flags, void *cb_data, struct ref_entry *entry)
{ {
int retval;
if (prefixcmp(entry->name, base)) if (prefixcmp(entry->name, base))
return 0; return 0;
@ -262,7 +263,9 @@ static int do_one_ref(const char *base, each_ref_fn fn, int trim,
} }
} }
current_ref = entry; current_ref = entry;
return fn(entry->name + trim, entry->sha1, entry->flag, cb_data); retval = fn(entry->name + trim, entry->sha1, entry->flag, cb_data);
current_ref = NULL;
return retval;
} }
/* /*
@ -872,7 +875,7 @@ static int do_for_each_ref(const char *submodule, const char *base, each_ref_fn
} }
retval = do_one_ref(base, fn, trim, flags, cb_data, entry); retval = do_one_ref(base, fn, trim, flags, cb_data, entry);
if (retval) if (retval)
goto end_each; return retval;
} }
if (l < loose->nr) { if (l < loose->nr) {
@ -883,12 +886,10 @@ static int do_for_each_ref(const char *submodule, const char *base, each_ref_fn
for (; p < packed->nr; p++) { for (; p < packed->nr; p++) {
retval = do_one_ref(base, fn, trim, flags, cb_data, packed->refs[p]); retval = do_one_ref(base, fn, trim, flags, cb_data, packed->refs[p]);
if (retval) if (retval)
goto end_each; return retval;
} }
end_each: return 0;
current_ref = NULL;
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)