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>

diff --git a/builtin-branch.c b/builtin-branch.c
index 91098ca9b106239916af000cb54a4bf09629e6b6..3784dda0907d69561dbfa3838ebdb8795bce068e 100644 (file)
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -240,6 +240,10 @@ static int append_ref(const char *refname, const unsigned char *sha1, int flags,
        if (ARRAY_SIZE(ref_kind) <= i)
                return 0;
 
        if (ARRAY_SIZE(ref_kind) <= i)
                return 0;
 

+       /* Don't add types the caller doesn't want */
+       if ((kind & ref_list->kinds) == 0)
+               return 0;
+

        commit = lookup_commit_reference_gently(sha1, 1);
        if (!commit)
                return error("branch '%s' does not point at a commit", refname);
        commit = lookup_commit_reference_gently(sha1, 1);
        if (!commit)
                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,
        if (!is_descendant_of(commit, ref_list->with_commit))
                return 0;
 
        if (!is_descendant_of(commit, ref_list->with_commit))
                return 0;
 

-       /* Don't add types the caller doesn't want */
-       if ((kind & ref_list->kinds) == 0)
-               return 0;
-

        if (merge_filter != NO_FILTER)
                add_pending_object(&ref_list->revs,
                                   (struct object *)commit, refname);
        if (merge_filter != NO_FILTER)
                add_pending_object(&ref_list->revs,
                                   (struct object *)commit, refname);


@@ -426,7 +426,7 @@ static void print_ref_list(int kinds, int detached, int verbose, int abbrev, str
        ref_list.with_commit = with_commit;
        if (merge_filter != NO_FILTER)
                init_revisions(&ref_list.revs, NULL);
        ref_list.with_commit = with_commit;
        if (merge_filter != NO_FILTER)
                init_revisions(&ref_list.revs, NULL);

-       for_each_ref(append_ref, &ref_list);
+       for_each_rawref(append_ref, &ref_list);

        if (merge_filter != NO_FILTER) {
                struct commit *filter;
                filter = lookup_commit_reference_gently(merge_filter_ref, 0);
        if (merge_filter != NO_FILTER) {
                struct commit *filter;
                filter = lookup_commit_reference_gently(merge_filter_ref, 0);