diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-04-20 14:33:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-04-20 14:33:36 -0700 |
| commit | 98c496fcd09b5894966f3e499217eb2bdf8b964d (patch) | |
| tree | 386d598dd4fc1a5f1152fab19d2b23b2597d8d81 | |
| parent | 08bd076ce4c8dcc654d6df9512d476b47d718e8a (diff) | |
| parent | fd7263742342d79fe9fdfb87448346d1744b8ad9 (diff) | |
Merge branch 'ar/t2024-checkout-output-fix'
Test fix.
* ar/t2024-checkout-output-fix:
t2024: fix loose/strict local base branch DWIM test
| -rwxr-xr-x | t/t2024-checkout-dwim.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/t/t2024-checkout-dwim.sh b/t/t2024-checkout-dwim.sh index 4a1c901456..74049a9812 100755 --- a/t/t2024-checkout-dwim.sh +++ b/t/t2024-checkout-dwim.sh @@ -305,10 +305,13 @@ test_expect_success 'loosely defined local base branch is reported correctly' ' test_config branch.strict.merge refs/heads/main && test_config branch.loose.merge main && - git checkout strict | sed -e "s/strict/BRANCHNAME/g" >expect && + git checkout strict >expect.raw 2>&1 && + sed -e "s/strict/BRANCHNAME/g" <expect.raw >expect && status_uno_is_clean && - git checkout loose | sed -e "s/loose/BRANCHNAME/g" >actual && + git checkout loose >actual.raw 2>&1 && + sed -e "s/loose/BRANCHNAME/g" <actual.raw >actual && status_uno_is_clean && + grep BRANCHNAME actual && test_cmp expect actual ' |