Re: [PATCH v2] bisect: don't use invalid oid as rev when starting
From: Junio C Hamano <hidden>
Date: 2020-09-24 19:25:46
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2020-09-25 · Re: [PATCH v2] bisect: don't use invalid oid as rev when starting · Christian Couder <hidden>
- 2020-09-24 · Re: [PATCH v2] bisect: don't use invalid oid as rev when starting · Junio C Hamano <hidden>
- 2020-09-24 · Re: [PATCH v2] bisect: don't use invalid oid as rev when starting · Junio C Hamano <hidden>
- 2020-09-24 · Re: [PATCH v2] bisect: don't use invalid oid as rev when starting · Junio C Hamano <hidden>
- 2020-09-24 · Re: [PATCH v2] bisect: don't use invalid oid as rev when starting · Junio C Hamano <hidden>
Junio C Hamano [off-list ref] writes:
We may need to audit recent additions of get_oid_committish() calls in our codebase. I suspect there may be other instances of the same mistake. Other than that, the code structure does look more straight-forward compared to the previous round. A fix on this version would involve peeling what is in oid down to commit, and you need to handle errors during that process, so it may not stay pretty with a fix, though. I dunno.
I'll queue it with this band-aid on top for now. Thanks. builtin/bisect--helper.c | 7 ++++--- t/t6030-bisect-porcelain.sh | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index a1f97e3f6c..2fcc023a3b 100644
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c@@ -474,13 +474,14 @@ static int bisect_start(struct bisect_terms *terms, int no_checkout, } else if (starts_with(arg, "--") && !one_of(arg, "--term-good", "--term-bad", NULL)) { return error(_("unrecognized option: '%s'"), arg); - } else if (!get_oid_committish(arg, &oid)) + } else if (!get_oidf(&oid, "%s^{commit}", arg)) { string_list_append(&revs, oid_to_hex(&oid)); - else if (has_double_dash) + } else if (has_double_dash) { die(_("'%s' does not appear to be a valid " "revision"), arg); - else + } else { break; + } } pathspec_pos = i;
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 94179b6acf..4dbfa63ca1 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh@@ -82,7 +82,7 @@ test_expect_success 'bisect fails if given any junk instead of revs' ' git bisect bad $HASH4 ' -test_expect_success 'bisect start without -- uses unknown arg as path restriction' ' +test_expect_success 'bisect start without -- takes unknown arg as pathspec' ' git bisect reset && git bisect start foo bar && grep foo ".git/BISECT_NAMES" &&