Skip to content

Commit 488e2e8

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

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
@@ -4146,9 +4146,7 @@ static int make_script_with_merges(struct pretty_print_context *pp,
41464146
struct object_id *oid = &parent->item->object.oid;
41474147
if (!oidset_contains(&interesting, oid))
41484148
continue;
4149-
if (!oidset_contains(&child_seen, oid))
4150-
oidset_insert(&child_seen, oid);
4151-
else
4149+
if (oidset_insert(&child_seen, oid))
41524150
label_oid(oid, "branch-point", &state);
41534151
}
41544152

0 commit comments

Comments
 (0)