bisect: libify `bisect_checkout`

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.

Turn `exit()` to `return` calls in `bisect_checkout()`.
Changes related to return values have no bad side effects on the
code that calls `bisect_checkout()`.

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>

diff --git a/bisect.c b/bisect.c
index 85bda3500b26ae02b840d9ba88c2576bda835074..f6582ddfed38d0f66f4e971337e9bbec68f4c4a8 100644 (file)
--- a/bisect.c
+++ b/bisect.c
@@ -704,9 +704,10 @@ static int is_expected_rev(const struct object_id *oid)
        return res;
 }
 
-static int bisect_checkout(const struct object_id *bisect_rev, int no_checkout)
+static enum bisect_error bisect_checkout(const struct object_id *bisect_rev, int no_checkout)
 {
        char bisect_rev_hex[GIT_MAX_HEXSZ + 1];
+       enum bisect_error res = BISECT_OK;
 
        memcpy(bisect_rev_hex, oid_to_hex(bisect_rev), the_hash_algo->hexsz + 1);
        update_ref(NULL, "BISECT_EXPECTED_REV", bisect_rev, NULL, 0, UPDATE_REFS_DIE_ON_ERR);
@@ -716,14 +717,24 @@ static int bisect_checkout(const struct object_id *bisect_rev, int no_checkout)
                update_ref(NULL, "BISECT_HEAD", bisect_rev, NULL, 0,
                           UPDATE_REFS_DIE_ON_ERR);
        } else {
-               int res;
                res = run_command_v_opt(argv_checkout, RUN_GIT_CMD);
                if (res)
-                       exit(res);
+                       /*
+                        * Errors in `run_command()` itself, signaled by res < 0,
+                        * and errors in the child process, signaled by res > 0
+                        * can both be treated as regular BISECT_FAILURE (-1).
+                        */
+                       return -abs(res);
        }
 
        argv_show_branch[1] = bisect_rev_hex;
-       return run_command_v_opt(argv_show_branch, RUN_GIT_CMD);
+       res = run_command_v_opt(argv_show_branch, RUN_GIT_CMD);
+       /*
+        * Errors in `run_command()` itself, signaled by res < 0,
+        * and errors in the child process, signaled by res > 0
+        * can both be treated as regular BISECT_FAILURE (-1).
+        */
+       return -abs(res);
 }
 
 static struct commit *get_commit_reference(struct repository *r,