mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/sequencer-oidset-insert-avoids-dups' into maint

Browse Source 
Code clean-up.

* rs/sequencer-oidset-insert-avoids-dups:
  sequencer: use return value of oidset_insert()
This commit is contained in:
Junio C Hamano
2018-11-21 22:58:02 +09:00
parent 171309399a 6e8fc70fce
commit 587b3f5d72
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sequencer.c
View File

@ -4145,9 +4145,7 @@ static int make_script_with_merges(struct pretty_print_context *pp,
struct object_id *oid = &parent->item->object.oid; struct object_id *oid = &parent->item->object.oid;
if (!oidset_contains(&interesting, oid)) if (!oidset_contains(&interesting, oid))
continue; continue;
if (!oidset_contains(&child_seen, oid)) if (oidset_insert(&child_seen, oid))
oidset_insert(&child_seen, oid);
else
label_oid(oid, "branch-point", &state); label_oid(oid, "branch-point", &state);
} }