]> git.ipfire.org Git - thirdparty/git.git/commit - t/t6030-bisect-porcelain.sh
bisect: don't use invalid oid as rev when starting
authorChristian Couder <christian.couder@gmail.com>
Fri, 25 Sep 2020 13:01:28 +0000 (15:01 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 25 Sep 2020 16:57:48 +0000 (09:57 -0700)
commit73c6de06aff8d14b5e9f55f393d25f1213f3d43d
treee10c169a88a4836192e0ec2b5c0a74edd6d5ce0e
parent7397ca33730626f682845f8691b39c305535611e
bisect: don't use invalid oid as rev when starting

In 06f5608c14 (bisect--helper: `bisect_start` shell function
partially in C, 2019-01-02), we changed the following shell
code:

-      rev=$(git rev-parse -q --verify "$arg^{commit}") || {
-              test $has_double_dash -eq 1 &&
-              die "$(eval_gettext "'\$arg' does not appear to be a valid revision")"
-              break
-      }
-      revs="$revs $rev"

into:

+      char *commit_id = xstrfmt("%s^{commit}", arg);
+      if (get_oid(commit_id, &oid) && has_double_dash)
+              die(_("'%s' does not appear to be a valid "
+                    "revision"), arg);
+
+      string_list_append(&revs, oid_to_hex(&oid));
+      free(commit_id);

In case of an invalid "arg" when "has_double_dash" is false, the old
code would "break" out of the argument loop.

In the new C code though, `oid_to_hex(&oid)` is unconditonally
appended to "revs". This is wrong first because "oid" is junk as
`get_oid(commit_id, &oid)` failed and second because it doesn't break
out of the argument loop.

Not breaking out of the argument loop means that "arg" is then not
treated as a path restriction (which is wrong).

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/bisect--helper.c
t/t6030-bisect-porcelain.sh