summaryrefslogtreecommitdiff
path: root/bisect.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-01-07 20:55:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-01-07 20:55:05 (GMT)
commit098501527f2b5628f086d3d9d2fda87220c069a5 (patch)
treed5874ea1c3185a6baa71719ff20e89ad57e53b46 /bisect.c
parent58e0362eddba1678a71c8990862053ff989527b6 (diff)
parent2ce406ccb85c4546b6d19309a6101b37c7bd952e (diff)
downloadgit-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 'bisect.c')
-rw-r--r--bisect.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/bisect.c b/bisect.c
index df09cbc..8c6d843 100644
--- a/bisect.c
+++ b/bisect.c
@@ -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;