diff options
| author | Đoàn Trần Công Danh <congdanhqx@gmail.com> | 2022-11-10 23:36:40 +0700 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-11-11 17:05:53 -0500 |
| commit | 8962f8f8887c15b3e55ebc348a2490290a55d8a5 (patch) | |
| tree | 8222aa93650fda89e437cb726711fc0f534cd6a9 | |
| parent | bisect run: keep some of the post-v2.30.0 output (diff) | |
| download | git-8962f8f8887c15b3e55ebc348a2490290a55d8a5.tar.gz git-8962f8f8887c15b3e55ebc348a2490290a55d8a5.zip | |
bisect-run: verify_good: account for non-negative exit status
Some system never reports negative exit code at all, they reports them
as bigger-than-128 instead. We take extra care for those systems in the
later check for normal 'do_bisect_run' loop.
Let's check it here, too.
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
| -rw-r--r-- | builtin/bisect--helper.c | 2 | ||||
| -rwxr-xr-x | t/t6030-bisect-porcelain.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index 180c2faa7f..e214190599 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -1211,7 +1211,7 @@ static int bisect_run(struct bisect_terms *terms, const char **argv, int argc) if (is_first_run && (res == 126 || res == 127)) { int rc = verify_good(terms, command.buf); is_first_run = 0; - if (rc < 0) { + if (rc < 0 || 128 <= rc) { error(_("unable to verify %s on good" " revision"), command.buf); res = BISECT_FAILED; diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 34fd45a48e..03d99b22f1 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -347,7 +347,7 @@ test_expect_success 'git bisect run: negative exit code' " test_cmp expect actual " -test_expect_failure 'git bisect run: unable to verify on good' " +test_expect_success 'git bisect run: unable to verify on good' " write_script fail.sh <<-'EOF' && head=\$(git rev-parse --verify HEAD) good=\$(git rev-parse --verify $HASH1) |