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 /merge-recursive.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 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 25c067e..771f5e2 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1901,7 +1901,7 @@ int merge_recursive(struct merge_options *o, } if (!ca) { - ca = get_merge_bases(h1, h2, 1); + ca = get_merge_bases(h1, h2); ca = reverse_commit_list(ca); } |