From: "René Scharfe" <l.s.r@web.de>
To: Ramkumar Ramachandra <r@artagnon.com>,
Junio C Hamano <gitster@pobox.com>
Cc: Git List <git@vger.kernel.org>,
Tanushree Tumane <tanushreetumane@gmail.com>
Subject: [PATCH] bisect: report actual bisect_state() argument on error
Date: Mon, 10 Jan 2022 10:01:22 +0100 [thread overview]
Message-ID: <5d8c8a72-6c4f-35e4-a6a4-4ed7d6f23c4e@web.de> (raw)
In-Reply-To: <fead25d6-6f5f-487a-ad4c-0657fe9785fd@www.fastmail.com>
The strvec "args" in bisect_run() is initialized and cleared, but never
added to. Nevertheless its first member is printed when reporting a
bisect_state() error. That's not useful, since it's always NULL.
Before d1bbbe45df (bisect--helper: reimplement `bisect_run` shell
function in C, 2021-09-13) the new state was reported if it could not
been set. Reinstate that behavior and remove the unused strvec.
Reported-by: Ramkumar Ramachandra <r@artagnon.com>
Signed-off-by: René Scharfe <l.s.r@web.de>
---
This doesn't fix your problem, only replace the "(null)" in the error
messages with the actual state name -- which may be useful for
diagnosing its cause, though.
Patch generated with --function-context for easier review.
builtin/bisect--helper.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 28a2e6a575..1dbc6294ef 100644
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -1092,80 +1092,76 @@ static int bisect_visualize(struct bisect_terms *terms, const char **argv, int a
static int bisect_run(struct bisect_terms *terms, const char **argv, int argc)
{
int res = BISECT_OK;
struct strbuf command = STRBUF_INIT;
- struct strvec args = STRVEC_INIT;
struct strvec run_args = STRVEC_INIT;
const char *new_state;
int temporary_stdout_fd, saved_stdout;
if (bisect_next_check(terms, NULL))
return BISECT_FAILED;
if (argc)
sq_quote_argv(&command, argv);
else {
error(_("bisect run failed: no command provided."));
return BISECT_FAILED;
}
strvec_push(&run_args, command.buf);
while (1) {
- strvec_clear(&args);
-
printf(_("running %s\n"), command.buf);
res = run_command_v_opt(run_args.v, RUN_USING_SHELL);
if (res < 0 || 128 <= res) {
error(_("bisect run failed: exit code %d from"
" '%s' is < 0 or >= 128"), res, command.buf);
strbuf_release(&command);
return res;
}
if (res == 125)
new_state = "skip";
else if (!res)
new_state = terms->term_good;
else
new_state = terms->term_bad;
temporary_stdout_fd = open(git_path_bisect_run(), O_CREAT | O_WRONLY | O_TRUNC, 0666);
if (temporary_stdout_fd < 0)
return error_errno(_("cannot open file '%s' for writing"), git_path_bisect_run());
fflush(stdout);
saved_stdout = dup(1);
dup2(temporary_stdout_fd, 1);
res = bisect_state(terms, &new_state, 1);
fflush(stdout);
dup2(saved_stdout, 1);
close(saved_stdout);
close(temporary_stdout_fd);
print_file_to_stdout(git_path_bisect_run());
if (res == BISECT_ONLY_SKIPPED_LEFT)
error(_("bisect run cannot continue any more"));
else if (res == BISECT_INTERNAL_SUCCESS_MERGE_BASE) {
printf(_("bisect run success"));
res = BISECT_OK;
} else if (res == BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND) {
printf(_("bisect found first bad commit"));
res = BISECT_OK;
} else if (res) {
error(_("bisect run failed: 'git bisect--helper --bisect-state"
- " %s' exited with error code %d"), args.v[0], res);
+ " %s' exited with error code %d"), new_state, res);
} else {
continue;
}
strbuf_release(&command);
- strvec_clear(&args);
strvec_clear(&run_args);
return res;
}
}
--
2.34.1
next prev parent reply other threads:[~2022-01-10 9:03 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-09 19:29 git bisect bad @ Ramkumar Ramachandra
2022-01-09 19:54 ` Junio C Hamano
2022-01-09 20:48 ` Ramkumar Ramachandra
2022-01-10 9:01 ` René Scharfe [this message]
2022-01-10 10:04 ` [PATCH] bisect: report actual bisect_state() argument on error Ramkumar Ramachandra
2022-01-10 17:06 ` git bisect bad @ Junio C Hamano
2022-01-10 21:04 ` Ramkumar Ramachandra
2022-01-12 9:04 ` René Scharfe
2022-01-12 17:50 ` Junio C Hamano
2022-01-12 18:34 ` René Scharfe
2022-01-13 5:10 ` René Scharfe
2022-01-13 9:32 ` Ramkumar Ramachandra
2022-01-13 12:28 ` Christian Couder
2022-01-13 13:55 ` René Scharfe
2022-01-13 15:16 ` Ramkumar Ramachandra
2022-01-14 7:47 ` René Scharfe
2022-01-14 8:04 ` Ramkumar Ramachandra
2022-01-18 12:45 ` René Scharfe
2022-01-14 18:42 ` Junio C Hamano
2022-01-13 18:40 ` Junio C Hamano
2022-01-18 12:45 ` [PATCH v2 1/4] bisect--helper: report actual bisect_state() argument on error René Scharfe
2022-01-18 12:46 ` [PATCH v2 2/4] bisect--helper: release strbuf and strvec on run error René Scharfe
2022-01-18 12:46 ` [PATCH v2 3/4] bisect: document run behavior with exit codes 126 and 127 René Scharfe
2022-01-18 12:46 ` [PATCH v2 4/4] bisect--helper: double-check run command on exit code " René Scharfe
2022-01-19 2:36 ` Junio C Hamano
2022-01-19 7:52 ` René Scharfe
2022-02-04 0:42 ` Junio C Hamano
2022-02-04 17:16 ` René Scharfe
2022-02-04 18:16 ` Ramkumar Ramachandra
2022-02-04 19:32 ` Junio C Hamano
2022-02-04 18:09 ` Ramkumar Ramachandra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5d8c8a72-6c4f-35e4-a6a4-4ed7d6f23c4e@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=r@artagnon.com \
--cc=tanushreetumane@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.