Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'rs/sequencer-oidset-insert-avoids-dups'
author
Junio C Hamano
<gitster@pobox.com>
Tue, 16 Oct 2018 07:16:08 +0000
(16:16 +0900)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 16 Oct 2018 07:16:08 +0000
(16:16 +0900)
Code clean-up.
* rs/sequencer-oidset-insert-avoids-dups:
sequencer: use return value of oidset_insert()
sequencer.c
patch
|
blob
|
history
raw
(from parent 1:
ee56992
)
diff --git
a/sequencer.c
b/sequencer.c
index ddb41a62d955552e355abff2d6d1115c0d2b0361..6387c9ee6e8ba20aa276cf3fb9620d2caed70079 100644
(file)
--- a/
sequencer.c
+++ b/
sequencer.c
@@
-4146,9
+4146,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);
}