зеркало из https://github.com/microsoft/git.git
find_first_merges(): remove unnecessary code
No names are ever set for the object_array_entries in merges, so there is no need to pretend to copy them to the result array. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
3826902d25
Коммит
5de0c0155c
|
@ -893,8 +893,7 @@ static int find_first_merges(struct object_array *result, const char *path,
|
|||
}
|
||||
|
||||
if (!contains_another)
|
||||
add_object_array(merges.objects[i].item,
|
||||
merges.objects[i].name, result);
|
||||
add_object_array(merges.objects[i].item, NULL, result);
|
||||
}
|
||||
|
||||
free(merges.objects);
|
||||
|
|
Загрузка…
Ссылка в новой задаче