diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-01-07 20:55:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-01-07 20:55:05 (GMT) |
| commit | 098501527f2b5628f086d3d9d2fda87220c069a5 (patch) | |
| tree | d5874ea1c3185a6baa71719ff20e89ad57e53b46 /revision.c | |
| parent | 58e0362eddba1678a71c8990862053ff989527b6 (diff) | |
| parent | 2ce406ccb85c4546b6d19309a6101b37c7bd952e (diff) | |
| download | git-098501527f2b5628f086d3d9d2fda87220c069a5.zip git-098501527f2b5628f086d3d9d2fda87220c069a5.tar.gz git-098501527f2b5628f086d3d9d2fda87220c069a5.tar.bz2 | |
Merge branch 'jc/merge-bases'
The get_merge_bases*() API was easy to misuse by careless
copy&paste coders, leaving object flags tainted in the commits that
needed to be traversed.
* jc/merge-bases:
get_merge_bases(): always clean-up object flags
bisect: clean flags after checking merge bases
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1441,7 +1441,7 @@ static void prepare_show_merge(struct rev_info *revs) other = lookup_commit_or_die(sha1, "MERGE_HEAD"); add_pending_object(revs, &head->object, "HEAD"); add_pending_object(revs, &other->object, "MERGE_HEAD"); - bases = get_merge_bases(head, other, 1); + bases = get_merge_bases(head, other); add_rev_cmdline_list(revs, bases, REV_CMD_MERGE_BASE, UNINTERESTING | BOTTOM); add_pending_commit_list(revs, bases, UNINTERESTING | BOTTOM); free_commit_list(bases); @@ -1546,7 +1546,7 @@ int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsi : lookup_commit_reference(b_obj->sha1)); if (!a || !b) goto missing; - exclude = get_merge_bases(a, b, 1); + exclude = get_merge_bases(a, b); add_rev_cmdline_list(revs, exclude, REV_CMD_MERGE_BASE, flags_exclude); |