mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ds/reachable'

Browse Source 
Recent update broke the reachability algorithm when refs (e.g.
tags) that point at objects that are not commit were involved,
which has been fixed.

* ds/reachable:
  commit-reach: fix memory and flag leaks
  commit-reach: properly peel tags
This commit is contained in:
Junio C Hamano
2018-09-24 10:30:52 -07:00
parent faadedb195 4067a64672
commit 0f7ac90dbe
3 changed files with 79 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
commit-reach.c
View File

@ -547,20 +547,42 @@ int can_all_from_reach_with_flag(struct object_array *from,
{
struct commit **list = NULL;
int i;
int nr_commits;
int result = 1;
ALLOC_ARRAY(list, from->nr);
nr_commits = 0;
for (i = 0; i < from->nr; i++) {
list[i] = (struct commit *)from->objects[i].item;
struct object *from_one = from->objects[i].item;
if (parse_commit(list[i]) ||
list[i]->generation < min_generation)
return 0;
if (!from_one || from_one->flags & assign_flag)
continue;
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
* looking at the ancestry chain alone, so
* leave a note to ourselves not to worry about
* this object anymore.
*/
from->objects[i].item->flags |= assign_flag;
continue;
}
list[nr_commits] = (struct commit *)from_one;
if (parse_commit(list[nr_commits]) ||
list[nr_commits]->generation < min_generation) {
result = 0;
goto cleanup;
}
nr_commits++;
}
QSORT(list, from->nr, compare_commits_by_gen);
QSORT(list, nr_commits, compare_commits_by_gen);
for (i = 0; i < from->nr; i++) {
for (i = 0; i < nr_commits; i++) {
/* DFS from list[i] */
struct commit_list *stack = NULL;
@ -603,10 +625,15 @@ int can_all_from_reach_with_flag(struct object_array *from,
}
cleanup:
for (i = 0; i < from->nr; i++) {
for (i = 0; i < nr_commits; i++) {
clear_commit_marks(list[i], RESULT);
clear_commit_marks(list[i], assign_flag);
}
free(list);
for (i = 0; i < from->nr; i++)
from->objects[i].item->flags &= ~assign_flag;
return result;
}