Skip to content

Commit b17ca8f

Browse files
committed
rebase: apply cocci patch
Favor oideq() over !oidcmp() when checking for equality. Signed-off-by: Junio C Hamano <[email protected]>
1 parent 85fcf1c commit b17ca8f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

builtin/rebase.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ static int can_fast_forward(struct commit *onto, struct object_id *head_oid,
689689
merge_bases = get_merge_bases(onto, head);
690690
if (merge_bases && !merge_bases->next) {
691691
oidcpy(merge_base, &merge_bases->item->object.oid);
692-
res = !oidcmp(merge_base, &onto->object.oid);
692+
res = oideq(merge_base, &onto->object.oid);
693693
} else {
694694
oidcpy(merge_base, &null_oid);
695695
res = 0;

0 commit comments

Comments
 (0)