diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-05-19 23:35:56 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-05-19 23:35:57 +0300 |
| commit | cacc15ee3fa1a00b1a01ca2caf050cf2f6e0cc8f (patch) | |
| tree | 268c9b0c2e956fb4b7095d45f9b49f0a5e154ba5 /t/t3430-rebase-merges.sh | |
| parent | dc3fd2486f4576a61570917c2ea6e165d380382d (diff) | |
| parent | 170eea9750e1bca7a35b5d27def9ee77df92fdf1 (diff) | |
Merge branch 'js/rebase-count-fixes'
A few bugs in the sequencer machinery that results in miscounting
the steps have been corrected.
* js/rebase-count-fixes:
rebase -r: fix the total number shown in the progress
rebase --update-refs: fix loops
Diffstat (limited to 't/t3430-rebase-merges.sh')
| -rwxr-xr-x | t/t3430-rebase-merges.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh index f03599c63b..96ae0edf1e 100755 --- a/t/t3430-rebase-merges.sh +++ b/t/t3430-rebase-merges.sh @@ -578,4 +578,12 @@ 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 && + # Expecting "Rebasing (N/14)" here, no bogus total number + grep "^Rebasing.*/14.$" err >progress && + test_line_count = 14 progress +' + test_done |