diff options
| author |  Christian Couder <chriscool@tuxfamily.org> | 2009-05-09 17:55:47 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-05-10 14:30:33 -0700 |
| commit | 0871984d304c9201b85897743eae583cd165106d (patch) | |
| tree | 17a53776230bbb2b4d47c3ce7444fe403821fddf /bisect.c | |
| parent | bisect: add "check_good_are_ancestors_of_bad" function (diff) | |
| download | tgif-0871984d304c9201b85897743eae583cd165106d.tar.xz | |
bisect: make "git bisect" use new "--next-all" bisect-helper function
This patch replace the "--next-exit" option of "git bisect--helper"
with a "--next-all" option that does merge base checking using
the "check_good_are_ancestors_of_bad" function implemented in
"bisect.c" in a former patch.
The new "--next-all" option is then used in "git-bisect.sh" instead
of the "--next-exit" option, and all the shell functions in
"git-bisect.sh" that are now unused are removed.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'bisect.c')
| -rw-r--r-- | bisect.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -830,7 +830,7 @@ static void check_good_are_ancestors_of_bad(const char *prefix) * the bisection process finished successfully. * In this case the calling shell script should exit 0. */ -int bisect_next_exit(const char *prefix) +int bisect_next_all(const char *prefix) { struct rev_info revs; struct commit_list *tried; @@ -841,6 +841,8 @@ int bisect_next_exit(const char *prefix) if (read_bisect_refs()) die("reading bisect refs failed"); + check_good_are_ancestors_of_bad(prefix); + bisect_rev_setup(&revs, prefix); bisect_common(&revs, &reaches, &all); |