summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerrick Stolee <dstolee@microsoft.com>2018-09-25 13:27:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-09-25 18:07:02 (GMT)
commit85806440b165ba41953f9faf31ad29d5cc45cb0a (patch)
tree9e921de3a494fdb7c1bead327b4d705633297bf5
parent4067a64672f9db8ca38d5a2682a7cdba7938c18b (diff)
downloadgit-85806440b165ba41953f9faf31ad29d5cc45cb0a.zip
git-85806440b165ba41953f9faf31ad29d5cc45cb0a.tar.gz
git-85806440b165ba41953f9faf31ad29d5cc45cb0a.tar.bz2
commit-reach: cleanups in can_all_from_reach...
Due to a regression introduced by 4fbcca4e "commit-reach: make can_all_from_reach... linear" the series including b67f6b26 "commit-reach: properly peel tags" was merged to master quickly. There were a few more cleanups left to apply in the series, which are included by this change: 1. Clean up a comment that is in the incorrect style. 2. Replace multiple calls to clear_commit_marks() with one call to clear_commit_marks_many(). Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--commit-reach.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/commit-reach.c b/commit-reach.c
index 5a84544..66aa412 100644
--- a/commit-reach.c
+++ b/commit-reach.c
@@ -558,7 +558,8 @@ int can_all_from_reach_with_flag(struct object_array *from,
from_one = deref_tag(the_repository, from_one,
"a from object", 0);
if (!from_one || from_one->type != OBJ_COMMIT) {
- /* no way to tell if this is reachable by
+ /*
+ * no way to tell if this is reachable by
* looking at the ancestry chain alone, so
* leave a note to ourselves not to worry about
* this object anymore.
@@ -622,10 +623,7 @@ int can_all_from_reach_with_flag(struct object_array *from,
}
cleanup:
- for (i = 0; i < nr_commits; i++) {
- clear_commit_marks(list[i], RESULT);
- clear_commit_marks(list[i], assign_flag);
- }
+ clear_commit_marks_many(nr_commits, list, RESULT | assign_flag);
free(list);
for (i = 0; i < from->nr; i++)