提交 5de0c015 编写于 作者: M Michael Haggerty 提交者: Junio C Hamano

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: NMichael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 3826902d
......@@ -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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册