Skip to content

Commit 98c496f

Browse files
committed
Merge branch 'ar/t2024-checkout-output-fix'
Test fix. * ar/t2024-checkout-output-fix: t2024: fix loose/strict local base branch DWIM test
2 parents 08bd076 + fd72637 commit 98c496f

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

t/t2024-checkout-dwim.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,10 +305,13 @@ test_expect_success 'loosely defined local base branch is reported correctly' '
305305
test_config branch.strict.merge refs/heads/main &&
306306
test_config branch.loose.merge main &&
307307
308-
git checkout strict | sed -e "s/strict/BRANCHNAME/g" >expect &&
308+
git checkout strict >expect.raw 2>&1 &&
309+
sed -e "s/strict/BRANCHNAME/g" <expect.raw >expect &&
309310
status_uno_is_clean &&
310-
git checkout loose | sed -e "s/loose/BRANCHNAME/g" >actual &&
311+
git checkout loose >actual.raw 2>&1 &&
312+
sed -e "s/loose/BRANCHNAME/g" <actual.raw >actual &&
311313
status_uno_is_clean &&
314+
grep BRANCHNAME actual &&
312315
313316
test_cmp expect actual
314317
'

0 commit comments

Comments
 (0)