summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-10-16 07:16:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-10-16 07:16:04 (GMT)
commite366d0c6d04a5c29a8ef49c61bc28209f543f69a (patch)
treeaa127e2394a83f2579d72a956432aa5256d1afe3
parent20e0ef6a0379bd5fb88fd7435b99f287045b2b30 (diff)
parent85806440b165ba41953f9faf31ad29d5cc45cb0a (diff)
downloadgit-e366d0c6d04a5c29a8ef49c61bc28209f543f69a.zip
git-e366d0c6d04a5c29a8ef49c61bc28209f543f69a.tar.gz
git-e366d0c6d04a5c29a8ef49c61bc28209f543f69a.tar.bz2
Merge branch 'ds/reachable-final-cleanup'
Code already in 'master' is further cleaned-up by this patch. * ds/reachable-final-cleanup: commit-reach: cleanups in can_all_from_reach...
-rw-r--r--commit-reach.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/commit-reach.c b/commit-reach.c
index 00e5cee..67e1792 100644
--- a/commit-reach.c
+++ b/commit-reach.c
@@ -561,7 +561,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.
@@ -625,10 +626,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++)