git branch: fix performance problem
'git branch' looks at _all_ the refs, and verifies them. Which means that during cold-cache situations with a slow disk (and lots of tags, for example) it can take several very annoying seconds (7.5s according to a report by Carlos R. Mafra). This avoids most of it by simply doing the filtering before looking up the commits, by using the "raw" version of for_each_ref. Reported-by: Carlos R. Mafra <crmafra2@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Linus Torvalds committed
Jul 23, 2009 at 10:17 UTC
e6e4a47ba12bd19ed956251f191b1ea9915f61f8
1 file changed
+5
-5
builtin-branch.c
+5
-5
@@ -240,6 +240,10 @@ static int append_ref(const char *refname, const unsigned char *sha1, int flags,
240
if (ARRAY_SIZE(ref_kind) <= i)
241
return 0;
242
243
+ /* Don't add types the caller doesn't want */
244
+ if ((kind & ref_list->kinds) == 0)
245
+ return 0;
246
+
247
commit = lookup_commit_reference_gently(sha1, 1);
248
if (!commit)
249
return error("branch '%s' does not point at a commit", refname);
@@ -248,10 +252,6 @@ static int append_ref(const char *refname, const unsigned char *sha1, int flags,
252
if (!is_descendant_of(commit, ref_list->with_commit))
253
return 0;
254
251
- /* Don't add types the caller doesn't want */
252
- if ((kind & ref_list->kinds) == 0)
253
- return 0;
254
-
255
if (merge_filter != NO_FILTER)
256
add_pending_object(&ref_list->revs,
257
(struct object *)commit, refname);
@@ -426,7 +426,7 @@ static void print_ref_list(int kinds, int detached, int verbose, int abbrev, str
426
ref_list.with_commit = with_commit;
427
if (merge_filter != NO_FILTER)
428
init_revisions(&ref_list.revs, NULL);
429
- for_each_ref(append_ref, &ref_list);
429
+ for_each_rawref(append_ref, &ref_list);
430
if (merge_filter != NO_FILTER) {
431
struct commit *filter;
432
filter = lookup_commit_reference_gently(merge_filter_ref, 0);