Re: Performance issue of 'git branch'
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: 2016-06-15 22:47:05
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: Performance issue of 'git branch' · Junio C Hamano <hidden>
- 2016-06-15 · Re: Performance issue of 'git branch' · George Spelvin <hidden>
- 2016-06-15 · Performance issue of 'git branch' · Carlos R. Mafra <hidden>
- 2016-06-15 · Re: Performance issue of 'git branch' · Linus Torvalds <torvalds@linux-foundation.org>
- 2016-06-15 · Re: Performance issue of 'git branch' · SZEDER Gábor <hidden>
On Thu, 23 Jul 2009, Carlos R. Mafra wrote:
Everytime I did the first 'git branch' those 5 seconds really hurt, because I wondered why it couldn't be done in 0s like subsequent commands. But sure, this was definitely not a pressing issue and your patch made it even less. I am happy that it takes 1s now, and I really appreciated your patch!
You could try something like this (on _top_ of the previous patch). Not very exhaustively tested, but it's pretty simple. It will still do _some_ object lookups. In particular, it will do the HEAD lookup in 'print_ref_list()', even if it's not strictly necessary. But it should cut down the noise further. Linus --- builtin-branch.c | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/builtin-branch.c b/builtin-branch.c
index 54a89ff..82c2cf0 100644
--- a/builtin-branch.c
+++ b/builtin-branch.c@@ -191,7 +191,7 @@ struct ref_item { struct ref_list { struct rev_info revs; - int index, alloc, maxwidth; + int index, alloc, maxwidth, verbose; struct ref_item *list; struct commit_list *with_commit; int kinds;
@@ -244,17 +244,20 @@ static int append_ref(const char *refname, const unsigned char *sha1, int flags, 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 = NULL; + if (ref_list->verbose || ref_list->with_commit || merge_filter != NO_FILTER) { + commit = lookup_commit_reference_gently(sha1, 1); + if (!commit) + return error("branch '%s' does not point at a commit", refname); - /* Filter with with_commit if specified */ - if (!is_descendant_of(commit, ref_list->with_commit)) - return 0; + /* Filter with with_commit if specified */ + if (!is_descendant_of(commit, ref_list->with_commit)) + 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); + } /* Resize buffer */ if (ref_list->index >= ref_list->alloc) {
@@ -423,6 +426,7 @@ static void print_ref_list(int kinds, int detached, int verbose, int abbrev, str memset(&ref_list, 0, sizeof(ref_list)); ref_list.kinds = kinds; + ref_list.verbose = verbose; ref_list.with_commit = with_commit; if (merge_filter != NO_FILTER) init_revisions(&ref_list.revs, NULL);