Skip to content

Commit 209f214

Browse files
committed
treewide: apply cocci patch
1 parent 500967b commit 209f214

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

builtin/rebase.c

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

fsck.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ static int fsck_walk_commit(struct commit *commit, void *data, struct fsck_optio
479479
if (name) {
480480
struct object *obj = &parents->item->object;
481481

482-
if (++counter > 1)
482+
if (counter++)
483483
put_object_name(options, obj, "%s^%d",
484484
name, counter);
485485
else if (generation > 0)

0 commit comments

Comments
 (0)