revwalk: Properly mark uninteresting 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 47 48 49
diff --git a/src/revwalk.c b/src/revwalk.c
index cdad83f..e0b6cbe 100644
--- a/src/revwalk.c
+++ b/src/revwalk.c
@@ -269,10 +269,13 @@ static void mark_uninteresting(commit_object *commit)
mark_uninteresting(commit->parents[i]);
}
-static int process_commit(git_revwalk *walk, commit_object *commit)
+static int process_commit(git_revwalk *walk, commit_object *commit, int hide)
{
int error;
+ if (hide)
+ mark_uninteresting(commit);
+
if (commit->seen)
return GIT_SUCCESS;
@@ -281,9 +284,6 @@ static int process_commit(git_revwalk *walk, commit_object *commit)
if ((error = commit_parse(walk, commit)) < GIT_SUCCESS)
return git__rethrow(error, "Failed to process commit");
- if (commit->uninteresting)
- mark_uninteresting(commit);
-
return walk->enqueue(walk, commit);
}
@@ -293,7 +293,7 @@ static int process_commit_parents(git_revwalk *walk, commit_object *commit)
int error = GIT_SUCCESS;
for (i = 0; i < commit->out_degree && error == GIT_SUCCESS; ++i) {
- error = process_commit(walk, commit->parents[i]);
+ error = process_commit(walk, commit->parents[i], commit->uninteresting);
}
return error == GIT_SUCCESS ? GIT_SUCCESS : git__rethrow(error, "Failed to process commit parents");
@@ -307,9 +307,7 @@ static int push_commit(git_revwalk *walk, const git_oid *oid, int uninteresting)
if (commit == NULL)
return git__throw(GIT_ENOTFOUND, "Failed to push commit. Object not found");
- commit->uninteresting = uninteresting;
-
- return process_commit(walk, commit);
+ return process_commit(walk, commit, uninteresting);
}
int git_revwalk_push(git_revwalk *walk, const git_oid *oid)