Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Down <chris@chrisdown.name>2022-05-11 21:00:14 +0300
committerJunio C Hamano <gitster@pobox.com>2022-05-11 22:35:13 +0300
commitf11046e6def11a281a371918793226f30e3f8c12 (patch)
tree482e78b9f499078fefee280857b994d5f5ccea33 /t/t6030-bisect-porcelain.sh
parent0cf1defa5a6764b8a0fd956ff4d114cb014cb8a4 (diff)
bisect: output bisect setup status in bisect log
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6030-bisect-porcelain.sh')
-rwxr-xr-xt/t6030-bisect-porcelain.sh10
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 686f6d5c7f..83931d482f 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -1029,9 +1029,15 @@ 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 >output &&
+ grep "waiting for both good and bad commits" output &&
git bisect good "$HASH1" >output &&
grep "waiting for bad commit, 1 good commit known" output &&
+ git bisect log >output &&
+ grep "waiting for bad commit, 1 good commit known" output &&
git bisect good "$HASH2" >output &&
+ grep "waiting for bad commit, 2 good commits known" output &&
+ git bisect log >output &&
grep "waiting for bad commit, 2 good commits known" output
'
@@ -1039,7 +1045,11 @@ 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 >output &&
+ grep "waiting for both good and bad commits" output &&
git bisect bad "$HASH4" >output &&
+ grep -F "waiting for good commit(s), bad commit known" output &&
+ git bisect log >output &&
grep -F "waiting for good commit(s), bad commit known" output
'