summaryrefslogtreecommitdiff
path: root/bisect.h
diff options
context:
space:
mode:
authorPranit Bauva <pranit.bauva@gmail.com>2020-02-17 08:40:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-02-19 17:37:15 (GMT)
commit9ec598e0d55ff263e47d95e7d4decef1eb1b6ac6 (patch)
treed7abda0790a6582245f38db98e1f74629ff9507b /bisect.h
parent45b6370812cb9bc50212d50f071c8ae5dd851698 (diff)
downloadgit-9ec598e0d55ff263e47d95e7d4decef1eb1b6ac6.zip
git-9ec598e0d55ff263e47d95e7d4decef1eb1b6ac6.tar.gz
git-9ec598e0d55ff263e47d95e7d4decef1eb1b6ac6.tar.bz2
bisect: libify `handle_bad_merge_base` and its dependents
Since we want to get rid of git-bisect.sh, it would be necessary to convert those exit() calls to return statements so that errors can be reported. Emulate try catch in C by converting `exit(<positive-value>)` to `return <negative-value>`. Follow POSIX conventions to return <negative-value> to indicate error. Update all callers to handle the error returns. Mentored-by: Christian Couder <chriscool@tuxfamily.org> Mentored-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com> Signed-off-by: Tanushree Tumane <tanushreetumane@gmail.com> Signed-off-by: Miriam Rubio <mirucam@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'bisect.h')
-rw-r--r--bisect.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/bisect.h b/bisect.h
index f68ae85..0d97581 100644
--- a/bisect.h
+++ b/bisect.h
@@ -48,6 +48,7 @@ enum bisect_error {
BISECT_OK = 0,
BISECT_FAILED = -1,
BISECT_ONLY_SKIPPED_LEFT = -2,
+ BISECT_MERGE_BASE_CHECK = -3,
BISECT_INTERNAL_SUCCESS_MERGE_BASE = -11
};