зеркало из https://github.com/microsoft/git.git
commit-reach: cleanups in can_all_from_reach...
Due to a regression introduced by4fbcca4e
"commit-reach: make can_all_from_reach... linear" the series includingb67f6b26
"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>
This commit is contained in:
Родитель
4067a64672
Коммит
85806440b1
|
@ -558,7 +558,8 @@ int can_all_from_reach_with_flag(struct object_array *from,
|
||||||
from_one = deref_tag(the_repository, from_one,
|
from_one = deref_tag(the_repository, from_one,
|
||||||
"a from object", 0);
|
"a from object", 0);
|
||||||
if (!from_one || from_one->type != OBJ_COMMIT) {
|
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
|
* looking at the ancestry chain alone, so
|
||||||
* leave a note to ourselves not to worry about
|
* leave a note to ourselves not to worry about
|
||||||
* this object anymore.
|
* this object anymore.
|
||||||
|
@ -622,10 +623,7 @@ int can_all_from_reach_with_flag(struct object_array *from,
|
||||||
}
|
}
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
for (i = 0; i < nr_commits; i++) {
|
clear_commit_marks_many(nr_commits, list, RESULT | assign_flag);
|
||||||
clear_commit_marks(list[i], RESULT);
|
|
||||||
clear_commit_marks(list[i], assign_flag);
|
|
||||||
}
|
|
||||||
free(list);
|
free(list);
|
||||||
|
|
||||||
for (i = 0; i < from->nr; i++)
|
for (i = 0; i < from->nr; i++)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче