Skip to content

Commit 587b3f5

Browse files
committed
Merge branch 'rs/sequencer-oidset-insert-avoids-dups' into maint
Code clean-up. * rs/sequencer-oidset-insert-avoids-dups: sequencer: use return value of oidset_insert()
2 parents 1713093 + 6e8fc70 commit 587b3f5

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

sequencer.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4145,9 +4145,7 @@ static int make_script_with_merges(struct pretty_print_context *pp,
41454145
struct object_id *oid = &parent->item->object.oid;
41464146
if (!oidset_contains(&interesting, oid))
41474147
continue;
4148-
if (!oidset_contains(&child_seen, oid))
4149-
oidset_insert(&child_seen, oid);
4150-
else
4148+
if (oidset_insert(&child_seen, oid))
41514149
label_oid(oid, "branch-point", &state);
41524150
}
41534151

0 commit comments

Comments
 (0)