diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-01-07 12:55:05 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-01-07 12:55:05 -0800 |
commit | 098501527f2b5628f086d3d9d2fda87220c069a5 (patch) | |
tree | d5874ea1c3185a6baa71719ff20e89ad57e53b46 /bisect.c | |
parent | 58e0362eddba1678a71c8990862053ff989527b6 (diff) | |
parent | 2ce406ccb85c4546b6d19309a6101b37c7bd952e (diff) | |
download | git-098501527f2b5628f086d3d9d2fda87220c069a5.tar.gz |
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 'bisect.c')
-rw-r--r-- | bisect.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -777,7 +777,7 @@ static void check_merge_bases(int no_checkout) int rev_nr; struct commit **rev = get_bad_and_good_commits(&rev_nr); - result = get_merge_bases_many(rev[0], rev_nr - 1, rev + 1, 0); + result = get_merge_bases_many(rev[0], rev_nr - 1, rev + 1); for (; result; result = result->next) { const unsigned char *mb = result->item->object.sha1; |