summaryrefslogtreecommitdiff
path: root/builtin-clone.c
diff options
context:
space:
mode:
authorChristian Couder <chriscool@tuxfamily.org>2008-08-22 03:52:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-08-28 01:08:06 (GMT)
commitc9c4e2d5a25bbf637780f9b83e74c2a26fb957f5 (patch)
tree80b517a411a022eda5fdc20c47d864548c89f658 /builtin-clone.c
parentf821d0892173e4e46a71fef4d06995f7a81c9296 (diff)
downloadgit-c9c4e2d5a25bbf637780f9b83e74c2a26fb957f5.zip
git-c9c4e2d5a25bbf637780f9b83e74c2a26fb957f5.tar.gz
git-c9c4e2d5a25bbf637780f9b83e74c2a26fb957f5.tar.bz2
bisect: only check merge bases when needed
When one good revision is not an ancestor of the bad revision, the merge bases between the good and the bad revision should be checked to make sure that they are also good revisions. A previous patch takes care of that, but it may check the merge bases more often than really needed. In fact the previous patch did not try to optimize this as much as possible because it is not so simple. So this is the purpose of this patch. One may think that when all the merge bases have been checked then we can save a flag, so that we don't need to check the merge bases again during the bisect process. The problem is that the user may choose to checkout and test something completely different from what the bisect process suggested. In this case we have to check the merge bases again, because there may be new merge bases relevant to the bisect process. That's why, in this patch, when we detect that the user tested something else than what the bisect process suggested, we remove the flag that says that we don't need to check the merge bases again. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-clone.c')
0 files changed, 0 insertions, 0 deletions