From: Junio C Hamano <gitster@pobox.com>
To: Miriam Rubio <mirucam@gmail.com>
Cc: git@vger.kernel.org, Pranit Bauva <pranit.bauva@gmail.com>,
Christian Couder <chriscool@tuxfamily.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Tanushree Tumane <tanushreetumane@gmail.com>
Subject: Re: [PATCH v2 06/11] bisect: libify `exit_if_skipped_commits` to `error_if_skipped*` and its dependents
Date: Fri, 31 Jan 2020 10:22:21 -0800 [thread overview]
Message-ID: <xmqq5zgrbi5e.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20200128144026.53128-7-mirucam@gmail.com> (Miriam Rubio's message of "Tue, 28 Jan 2020 15:40:21 +0100")
Miriam Rubio <mirucam@gmail.com> writes:
> From: Pranit Bauva <pranit.bauva@gmail.com>
>
> Since we want to get rid of git-bisect.sh it would be necessary to
Please add back the missing comma after ".sh" for readability.
> 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.
>
> Handle this return in dependent function `bisect_next_all()`.
It makes it sound as if there were multiple callers and this change
converted only one of them---"Update all callers to handle the error
returns" would avoid such a misunderstanding.
> diff --git a/bisect.c b/bisect.c
> index 83cb5b3a98..a7a5d158e6 100644
> --- a/bisect.c
> +++ b/bisect.c
> @@ -661,11 +661,11 @@ static void bisect_common(struct rev_info *revs)
> mark_edges_uninteresting(revs, NULL, 0);
> }
>
> -static void exit_if_skipped_commits(struct commit_list *tried,
> +static int error_if_skipped_commits(struct commit_list *tried,
> const struct object_id *bad)
> {
> if (!tried)
> - return;
> + return 0;
>
> printf("There are only 'skip'ped commits left to test.\n"
> "The first %s commit could be any of:\n", term_bad);
> @@ -676,7 +676,13 @@ static void exit_if_skipped_commits(struct commit_list *tried,
> if (bad)
> printf("%s\n", oid_to_hex(bad));
> printf(_("We cannot bisect more!\n"));
> - exit(2);
> +
> + /*
> + * We don't want to clean the bisection state
> + * as we need to get back to where we started
> + * by using `git bisect reset`.
> + */
What this comment says may be true, but does it belong here? After
returning, the caller will exit(2) without cleaning anyway with or
without this patch, so I am a bit puzzled about the comment.
> + return -2;
> }
>
> static int is_expected_rev(const struct object_id *oid)
> @@ -949,7 +955,7 @@ int bisect_next_all(struct repository *r, const char *prefix, int no_checkout)
> {
> struct rev_info revs;
> struct commit_list *tried;
> - int reaches = 0, all = 0, nr, steps;
> + int reaches = 0, all = 0, nr, steps, res;
> struct object_id *bisect_rev;
> char *steps_msg;
>
> @@ -972,8 +978,9 @@ int bisect_next_all(struct repository *r, const char *prefix, int no_checkout)
> * We should exit here only if the "bad"
> * commit is also a "skip" commit.
> */
> - exit_if_skipped_commits(tried, NULL);
> -
> + res = error_if_skipped_commits(tried, NULL);
> + if (res < 0)
> + exit(-res);
> printf(_("%s was both %s and %s\n"),
> oid_to_hex(current_bad_oid),
> term_good,
> @@ -990,7 +997,9 @@ int bisect_next_all(struct repository *r, const char *prefix, int no_checkout)
> bisect_rev = &revs.commits->item->object.oid;
>
> if (oideq(bisect_rev, current_bad_oid)) {
> - exit_if_skipped_commits(tried, current_bad_oid);
> + res = error_if_skipped_commits(tried, current_bad_oid);
> + if (res)
> + exit(-res);
> printf("%s is the first %s commit\n", oid_to_hex(bisect_rev),
> term_bad);
> show_diff_tree(r, prefix, revs.commits->item);
next prev parent reply other threads:[~2020-01-31 18:22 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-28 14:40 [Outreachy][PATCH v2 00/11] Finish converting git bisect to C part 1 Miriam Rubio
2020-01-28 14:40 ` [PATCH v2 01/11] bisect--helper: convert `vocab_*` char pointers to char arrays Miriam Rubio
2020-01-28 14:40 ` [PATCH v2 02/11] bisect--helper: change `retval` to `res` Miriam Rubio
2020-01-28 14:40 ` [PATCH v2 03/11] bisect: use the standard 'if (!var)' way to check for 0 Miriam Rubio
2020-01-28 14:40 ` [PATCH v2 04/11] run-command: make `exists_in_PATH()` non-static Miriam Rubio
2020-01-30 12:36 ` Johannes Schindelin
[not found] ` <CAN7CjDCiG6KZU+yHGxQ26TESb1yfvc7aWh0EKhE=owSV7D-C0Q@mail.gmail.com>
2020-01-30 14:41 ` Fwd: " Miriam R.
2020-01-28 14:40 ` [PATCH v2 05/11] bisect--helper: introduce new `decide_next()` function Miriam Rubio
2020-01-30 12:31 ` Johannes Schindelin
2020-01-30 14:05 ` Miriam R.
2020-01-28 14:40 ` [PATCH v2 06/11] bisect: libify `exit_if_skipped_commits` to `error_if_skipped*` and its dependents Miriam Rubio
2020-01-31 18:22 ` Junio C Hamano [this message]
2020-01-28 14:40 ` [PATCH v2 07/11] bisect: libify `bisect_checkout` Miriam Rubio
2020-01-31 18:31 ` Junio C Hamano
2020-01-28 14:40 ` [PATCH v2 08/11] bisect: libify `check_merge_bases` and its dependents Miriam Rubio
2020-01-31 18:40 ` Junio C Hamano
2020-01-28 14:40 ` [PATCH v2 09/11] bisect: libify `check_good_are_ancestors_of_bad` " Miriam Rubio
2020-01-30 13:46 ` Johannes Schindelin
2020-01-30 14:40 ` Miriam R.
2020-01-30 15:01 ` Johannes Schindelin
2020-01-30 15:26 ` Miriam R.
2020-01-30 21:59 ` Christian Couder
2020-01-31 9:07 ` Johannes Schindelin
2020-01-31 9:15 ` Christian Couder
[not found] ` <CAN7CjDC7ijMDtJdShRB+P0d0GRYYrQXktdH2Og9XGDqJ-OZxzw@mail.gmail.com>
2020-01-31 10:21 ` Fwd: " Miriam R.
2020-01-28 14:40 ` [PATCH v2 10/11] bisect: libify `handle_bad_merge_base` " Miriam Rubio
2020-01-28 14:40 ` [PATCH v2 11/11] bisect: libify `bisect_next_all` Miriam Rubio
2020-01-30 15:04 ` [Outreachy][PATCH v2 00/11] Finish converting git bisect to C part 1 Johannes Schindelin
2020-01-30 15:18 ` Miriam R.
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq5zgrbi5e.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=mirucam@gmail.com \
--cc=pranit.bauva@gmail.com \
--cc=tanushreetumane@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).