From: Chris Down <chris@chrisdown.name>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Christian Couder <chriscool@tuxfamily.org>,
kernel-team@fb.com
Subject: [PATCH v2 2/2] bisect: output bisect setup status in bisect log
Date: Fri, 6 May 2022 01:52:54 +0100 [thread overview]
Message-ID: <acab8859d02c95750fdbc691ac672c17d5be0291.1651796862.git.chris@chrisdown.name> (raw)
In-Reply-To: <cover.1651796862.git.chris@chrisdown.name>
This allows seeing the current intermediate status without adding a new
good or bad commit:
$ git bisect log | tail -1
# status: waiting for bad commit, 1 good commit known
Signed-off-by: Chris Down <chris@chrisdown.name>
---
builtin/bisect--helper.c | 25 ++++++++++++++++++++-----
t/t6030-bisect-porcelain.sh | 9 +++++++--
2 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 9d583f651c..ef75f0a0ce 100644
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -404,6 +404,21 @@ static struct bisect_state bisect_status(const struct bisect_terms *terms)
return bs;
}
+__attribute__((format (printf, 1, 2)))
+static void bisect_log_printf(const char *fmt, ...)
+{
+ va_list ap;
+ char buf[1024];
+
+ va_start(ap, fmt);
+ if (vsnprintf(buf, sizeof(buf), fmt, ap) < 0)
+ *buf = '\0';
+ va_end(ap);
+
+ printf("%s", buf);
+ append_to_file(git_path_bisect_log(), "# %s", buf);
+}
+
static void bisect_print_status(const struct bisect_terms *terms)
{
const struct bisect_state bs = bisect_status(terms);
@@ -413,13 +428,13 @@ static void bisect_print_status(const struct bisect_terms *terms)
return;
if (!bs.nr_good && !bs.nr_bad)
- printf(_("status: waiting for both good and bad commits\n"));
+ bisect_log_printf(_("status: waiting for both good and bad commits\n"));
else if (bs.nr_good)
- printf(Q_("status: waiting for bad commit, %d good commit known\n",
- "status: waiting for bad commit, %d good commits known\n",
- bs.nr_good), bs.nr_good);
+ bisect_log_printf(Q_("status: waiting for bad commit, %d good commit known\n",
+ "status: waiting for bad commit, %d good commits known\n",
+ bs.nr_good), bs.nr_good);
else
- printf(_("status: waiting for good commit(s), bad commit known\n"));
+ bisect_log_printf(_("status: waiting for good commit(s), bad commit known\n"));
}
static int bisect_next_check(const struct bisect_terms *terms,
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index a02587d1a7..d16730a2e2 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -1029,18 +1029,23 @@ test_expect_success 'bisect state output with multiple good commits' '
git bisect reset &&
git bisect start >output &&
grep "waiting for both good and bad commits" output &&
+ git bisect log | grep "waiting for both good and bad commits" &&
git bisect good "$HASH1" >output &&
grep "waiting for bad commit, 1 good commit known" output &&
+ git bisect log | grep "waiting for bad commit, 1 good commit known" &&
git bisect good "$HASH2" >output &&
- grep "waiting for bad commit, 2 good commits known" output
+ grep "waiting for bad commit, 2 good commits known" output &&
+ git bisect log | grep "waiting for bad commit, 2 good commits known"
'
test_expect_success 'bisect state output with bad commit' '
git bisect reset &&
git bisect start >output &&
grep "waiting for both good and bad commits" output &&
+ git bisect log | grep "waiting for both good and bad commits" &&
git bisect bad "$HASH4" >output &&
- grep -F "waiting for good commit(s), bad commit known" output
+ grep -F "waiting for good commit(s), bad commit known" output &&
+ git bisect log | grep -F "waiting for good commit(s), bad commit known"
'
test_done
--
2.36.0
next prev parent reply other threads:[~2022-05-06 0:53 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-06 0:52 [PATCH v2 0/2] bisect: status improvements when bisect is not fully fleshed out Chris Down
2022-05-06 0:52 ` [PATCH v2 1/2] bisect: output state before we are ready to compute bisection Chris Down
2022-05-06 2:52 ` Taylor Blau
2022-05-06 10:14 ` Chris Down
2022-05-06 16:42 ` Junio C Hamano
2022-05-06 18:12 ` Junio C Hamano
2022-05-06 0:52 ` Chris Down [this message]
2022-05-06 3:03 ` [PATCH v2 2/2] bisect: output bisect setup status in bisect log Taylor Blau
2022-05-06 10:09 ` Chris Down
2022-05-09 15:41 ` Taylor Blau
2022-05-06 16:57 ` Junio C Hamano
2022-05-06 16:47 ` Junio C Hamano
2022-05-06 18:18 ` Junio C Hamano
2022-05-09 15:43 ` Taylor Blau
2022-05-09 16:08 ` Junio C Hamano
2022-05-09 16:27 ` Taylor Blau
2022-05-07 10:58 ` [PATCH v2 0/2] bisect: status improvements when bisect is not fully fleshed out Chris Down
2022-05-07 18:25 ` Junio C Hamano
2022-05-07 21:22 ` Chris Down
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=acab8859d02c95750fdbc691ac672c17d5be0291.1651796862.git.chris@chrisdown.name \
--to=chris@chrisdown.name \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=kernel-team@fb.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).