提交 b17ca8f9 编写于 作者: J Junio C Hamano

rebase: apply cocci patch

Favor oideq() over !oidcmp() when checking for equality.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 85fcf1cb
......@@ -689,7 +689,7 @@ static int can_fast_forward(struct commit *onto, struct object_id *head_oid,
merge_bases = get_merge_bases(onto, head);
if (merge_bases && !merge_bases->next) {
oidcpy(merge_base, &merge_bases->item->object.oid);
res = !oidcmp(merge_base, &onto->object.oid);
res = oideq(merge_base, &onto->object.oid);
} else {
oidcpy(merge_base, &null_oid);
res = 0;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册