Skip to content

Commit 3179115

Browse files
committed
test: repair regression with git v2.48
git v2.48 does a bit more to figure out the remote HEAD when fetching, which affected a particular test case. Update that test case to accommodate the new/extra ref being displayed.
1 parent f20c9cd commit 3179115

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/t2200-rebase.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ test_expect_success 'Rebase without argument' '
5555
git checkout stack &&
5656
git branch --set-upstream-to=origin/master &&
5757
stg rebase 2>out &&
58-
grep "info: Rebasing to .*(master origin/master)" out &&
58+
grep -E "info: Rebasing to .*\(master( origin/HEAD)? origin/master\)" out &&
5959
test $(stg series --applied -c) = 1 &&
6060
grep bar file1 &&
6161
grep bar file2

0 commit comments

Comments
 (0)