[PATCH v2 0/6] bisect: follow-up fixes from js/bisect-in-c
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Jan 12, 2023, 15:19 UTC
- Message-ID
- <cover-v2-0.6-00000000000-20230112T151651Z-avarab@gmail.com>
- In-Reply-To
- <cover-0.6-00000000000-20221215T094038Z-avarab@gmail.com>
A trivial update to this topic of follow-up fixes to "bisect", which is now a built-in. See https://lore.kernel.org/git/cover-0.6-00000000000-20221215T094038Z-avarab@gmail.com/ for the v1 & general summary.
Change since v1:
* Rephrased & updated a commit message which was outdated as of f37d0bdd42d, see the range-diff. Thanks to Đoàn Trần Công Danh for spotting it.
Johannes Schindelin (5): bisect--helper: simplify exit code computation bisect: verify that a bogus option won't try to start a bisection bisect run: fix the error message bisect: remove Cogito-related code bisect: no longer try to clean up left-over `.git/head-name` files
Ævar Arnfjörð Bjarmason (1): bisect--helper: make the order consistently `argc, argv`
bisect.c | 3 --- builtin/bisect.c | 52 ++++++++++++++----------------------- t/t6030-bisect-porcelain.sh | 21 ++++++++++++++- 3 files changed, 40 insertions(+), 36 deletions(-)
Range-diff against v1:
1: c8c648e4b8c = 1: 32c45bbf851 bisect--helper: simplify exit code computation
2: a0de7ad6836 = 2: 1f4449dd081 bisect--helper: make the order consistently `argc, argv`
3: e1e31278fef = 3: 0cfb7dc572c bisect: verify that a bogus option won't try to start a bisection
4: 59a8a3085b1 ! 4: 4dda1019767 bisect run: fix the error message
@@ Commit message
However, the error message was supposed to print out whether the state
was "good" or "bad", but used a bogus (because non-populated) `args`
- variable for it. This was fixed in 80c2e9657f2 (bisect--helper: report
- actual bisect_state() argument on error, 2022-01-18), but the error
- message still talks about `bisect--helper`, which is an implementation
- detail that should not concern end users.
+ variable for it. This was fixed in [1], but as of [2] (when
+ `bisect--helper` was changed to the present `bisect-state') the error
+ message still talks about implementation details that should not
+ concern end users.
Fix that, and add a regression test to ensure that the intended form of
the error message.
+ 1. 80c2e9657f2 (bisect--helper: report actual bisect_state() argument
+ on error, 2022-01-18
+ 2. f37d0bdd42d (bisect: fix output regressions in v2.30.0, 2022-11-10)
+
Helped-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
5: 1b70cd79cae = 5: 1600ef41608 bisect: remove Cogito-related code
6: 2ad89aca728 = 6: 817fe726b4b bisect: no longer try to clean up left-over `.git/head-name` files-- 2.39.0.1215.g1ba3f685d4f