diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:58:02 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:58:02 +0900 |
| commit | 587b3f5d725cf118b6a58b9c974c01c26a61ec38 (patch) | |
| tree | 181198fc80f857952660b4a3016a40033b173d62 | |
| parent | 171309399a43a87af90dd3ca2b35a0f0f3aae908 (diff) | |
| parent | 6e8fc70fcefd4c362142c7d437488d3fbfdc22a8 (diff) | |
| download | git-587b3f5d725cf118b6a58b9c974c01c26a61ec38.tar.xz | |
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()
| -rw-r--r-- | sequencer.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sequencer.c b/sequencer.c index f388405b4e..24451bb683 100644 --- a/sequencer.c +++ b/sequencer.c @@ -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); } |
