Re: [PATCH v2 4/4] bisect--helper: double-check run command on exit code 126 and 127

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 4, 2022, 00:42 UTC
Message-ID: <xmqqa6f7pime.fsf@gitster.g>
In-Reply-To: <20987dc6-e0c7-6ca2-19fd-2b323b3f6d9f@web.de>

René Scharfe <l.s.r@web.de> writes:

Show 11 quoted lines

> When a run command cannot be executed or found, shells return exit code
> 126 or 127, respectively.  Valid run commands are allowed to return
> these codes as well to indicate bad revisions, though, for historical
> reasons.  This means typos can cause bogus bisect runs that go over the
> full distance and end up reporting invalid results.
>
> The best solution would be to reserve exit codes 126 and 127, like
> 71b0251cdd (Bisect run: "skip" current commit if script exit code is
> 125., 2007-10-26) did for 125, and abort bisect run when we get them.
> That might be inconvenient for those who relied on the documentation
> stating that 126 and 127 can be used for bad revisions, though.

I think the basic idea is sound and useful. How happy are we who was involved in the discussion with this result?

Show 6 quoted lines

> +static int get_first_good(const char *refname, const struct object_id *oid,
> +			  int flag, void *cb_data)
> +{
> +	oidcpy(cb_data, oid);
> +	return 1;
> +}

OK, this iterates and stops at the first one.

Show 16 quoted lines

> +static int verify_good(const struct bisect_terms *terms,
> +		       const char **quoted_argv)
> +{
> +	int rc;
> +	enum bisect_error res;
> +	struct object_id good_rev;
> +	struct object_id current_rev;
> +	char *good_glob = xstrfmt("%s-*", terms->term_good);
> +	int no_checkout = ref_exists("BISECT_HEAD");
> +
> +	for_each_glob_ref_in(get_first_good, good_glob, "refs/bisect/",
> +			     &good_rev);
> +	free(good_glob);
> +
> +	if (read_ref(no_checkout ? "BISECT_HEAD" : "HEAD", &current_rev))
> +		return -1;

 * Could the current_rev already be marked as "good", in which case
   we can avoid cost of rewriting working tree files to a
   potentially distant revision?  I often do manual tests to mark
   "bisect good" or "bisect bad" before using "bisect run".

 * Can we have *no* rev that is marked as "good"?  I think we made
   it possible to say "my time is more valuable than machine cycles,
   so I'll only tell you that this revision is broken and give you
   no limit on the bottom side of the history.  still assume that
   there was only one good-to-bad transition in the history and find
   it" by supplying only one "bad" and no "good" when starting to
   bisect.  And in such a case, ...

> +	res = bisect_checkout(&good_rev, no_checkout);

... this would feed an uninitialized object_id to bisect_checkout.

Thanks.