Re: [PATCH v3 2/2] bisect: add --reset-when-found to leave when done

Am 20.07.26 um 11:10 schrieb Harald Nordgren via GitGitGadget:

quoted

@@ -784,6 +859,10 @@ static enum bisect_error bisect_start(struct bisect_terms *terms, int argc,
                      break;
              }
      }
+     if (reset_when_found != RESET_WHEN_FOUND_NONE && no_checkout) {
+             res = error(_("'--reset-when-found' cannot be used with '--no-checkout'"));

We have a boilerplate text for this kind of error that saves a translation:

Good point, will fix both.

quoted

diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 081116220a..7dfb871ab9 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh

@@ -43,6 +43,38 @@ test_bisect_usage () {
      test_cmp expect actual
 }

+test_bisect_state_file () {
+     test_path_is_file "$(git rev-parse --git-path "$1")"
+}
+
+test_bisect_state_missing () {
+     test_path_is_missing "$(git rev-parse --git-path "$1")"
+}

These should not use `git` in a $( ) subshell to avoid a case of "ignore
failure in upstream of pipe". Note that

        local file=$(git rev-parse ...) &&
        test_path...

would be wrong, too, for the same reason. But

        local file
        file=$(git rev-parse ...) &&
        test_path...

works as desired.

Will update.


Harald