From b17ca8f94deb6e6c83ae705dcf712bf38a03ee4e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 1 Nov 2018 21:44:41 +0900 Subject: [PATCH] rebase: apply cocci patch Favor oideq() over !oidcmp() when checking for equality. Signed-off-by: Junio C Hamano --- builtin/rebase.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index d8e4e0e3a9..0ee06aa363 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -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; -- GitLab