Skip to content
Snippets Groups Projects
Commit 587b3f5d authored by Junio C Hamano's avatar Junio C Hamano
Browse files

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()
parents 17130939 6e8fc70f
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -4145,9 +4145,7 @@ static int make_script_with_merges(struct pretty_print_context *pp,
struct object_id *oid = &parent->item->object.oid;
if (!oidset_contains(&interesting, oid))
continue;
if (!oidset_contains(&child_seen, oid))
oidset_insert(&child_seen, oid);
else
if (oidset_insert(&child_seen, oid))
label_oid(oid, "branch-point", &state);
}
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment