diff --git a/README.md b/README.md index d2fe7fc..4dff2ac 100644 --- a/README.md +++ b/README.md @@ -130,7 +130,7 @@ This will show you which flags can safely enabled, and which flags require a mig ### --bisect `--bisect` flag allows you to bisect Bazel versions to find which version introduced a build failure. You can specify the range of versions to bisect with `--bisect=..`, where GOOD is the last known working Bazel version and BAD is the first known non-working Bazel version. Bazelisk uses [GitHub's compare API](https://docs.github.com/en/rest/commits/commits#compare-two-commits) to get the list of commits to bisect. When GOOD is not an ancestor of BAD, GOOD is reset to their merge base commit. -The meaning of GOOD and BAD can be reversed by prefixing the range with `~`, e.g. `--bisect=!6.0.0..HEAD` will find the first version 6.0.0 and HEAD that *fixes* the build. +The meaning of GOOD and BAD can be reversed by prefixing the range with `~`, e.g. `--bisect=~6.0.0..HEAD` will find the first version 6.0.0 and HEAD that *fixes* the build. Examples: ```shell diff --git a/core/core.go b/core/core.go index 620abe4..a722d9e 100644 --- a/core/core.go +++ b/core/core.go @@ -165,14 +165,14 @@ func RunBazeliskWithArgsFuncAndConfigAndOut(argsFunc ArgsFunc, repos *Repositori } else if len(args) > 0 && strings.HasPrefix(args[0], "--bisect") { // When --bisect is present, we run the bisect logic. if !strings.HasPrefix(args[0], "--bisect=") { - return -1, fmt.Errorf("Error: --bisect must have a value. Expected format: '--bisect=[!]..'") + return -1, fmt.Errorf("Error: --bisect must have a value. Expected format: '--bisect=[~]..'") } value := args[0][len("--bisect="):] commits := strings.Split(value, "..") if len(commits) == 2 { bisect(commits[0], commits[1], args[1:], bazeliskHome, repos, config) } else { - return -1, fmt.Errorf("Error: Invalid format for --bisect. Expected format: '--bisect=[!]..'") + return -1, fmt.Errorf("Error: Invalid format for --bisect. Expected format: '--bisect=[~]..'") } } @@ -805,7 +805,7 @@ func getBazelCommitsBetween(oldCommit string, newCommit string, config config.Co mergeBaseCommit := compResp.MergeBaseCommit.SHA if mergeBaseCommit != compResp.BaseCommit.SHA { - fmt.Printf("The old Bazel commit is not an ancestor of the good Bazel commit, overriding the old Bazel commit to the merge base commit %s\n", mergeBaseCommit) + fmt.Printf("The old Bazel commit is not an ancestor of the new Bazel commit, overriding the old Bazel commit to the merge base commit %s\n", mergeBaseCommit) oldCommit = mergeBaseCommit }