Merge pull request #3042 from libgit2/cmn/odd-slowdown revwalk: detect when we're out of interesting commits
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46
diff --git a/src/revwalk.c b/src/revwalk.c
index 9d0fafd..6acc5d0 100644
--- a/src/revwalk.c
+++ b/src/revwalk.c
@@ -41,11 +41,31 @@ git_commit_list_node *git_revwalk__commit_lookup(
return commit;
}
+typedef git_array_t(git_commit_list_node*) commit_list_node_array;
+
+static bool interesting_arr(commit_list_node_array arr)
+{
+ git_commit_list_node **n;
+ size_t i = 0, size;
+
+ size = git_array_size(arr);
+ for (i = 0; i < size; i++) {
+ n = git_array_get(arr, i);
+ if (!*n)
+ break;
+
+ if (!(*n)->uninteresting)
+ return true;
+ }
+
+ return false;
+}
+
static int mark_uninteresting(git_revwalk *walk, git_commit_list_node *commit)
{
int error;
unsigned short i;
- git_array_t(git_commit_list_node *) pending = GIT_ARRAY_INIT;
+ commit_list_node_array pending = GIT_ARRAY_INIT;
git_commit_list_node **tmp;
assert(commit);
@@ -66,7 +86,7 @@ static int mark_uninteresting(git_revwalk *walk, git_commit_list_node *commit)
tmp = git_array_pop(pending);
commit = tmp ? *tmp : NULL;
- } while (commit != NULL);
+ } while (commit != NULL && !interesting_arr(pending));
git_array_clear(pending);