Re: [PATCH 2/2] rebase -r: fix the total number shown in the progress
From: Junio C Hamano <hidden>
Date: 2023-05-10 23:39:05
"Johannes Schindelin via GitGitGadget" [off-list ref] writes:
quoted hunk
diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh index f351701fec2..8da99a075dc 100755 --- a/t/t3430-rebase-merges.sh +++ b/t/t3430-rebase-merges.sh@@ -517,4 +517,11 @@ test_expect_success '--rebase-merges with message matched with onto label' ' EOF ' +test_expect_success 'progress shows the correct total' ' + git checkout -b progress H && + git rebase --rebase-merges --force-rebase --verbose A 2> err && + grep "^Rebasing.*14.$" err >progress && + test_line_count = 14 progress +'
This is trying to find output lines that say "Rebasing (NN/14)";
Clarifying that we mean the denominator by matching
"^Rebasing.*/14)$"
or even
"^Rebasing ([0-9]*/14)$"
would have made it easier to grok (even though I know we do not have
114 steps to rebase in this one ;-).
Looks good. Will queue. Thanks.