diff options
author | Junio C Hamano <gitster@pobox.com> | 2024-01-22 20:26:18 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2024-01-22 20:26:19 +0300 |
commit | a20d4a9a7fdb62f71e8b2be79dabf8d37ab34d7d (patch) | |
tree | a8d44509580a3d7fa491c268dbd979805b37dbfa | |
parent | 36b46efbd0ebf212a8f627b59d48a72b43305af1 (diff) | |
parent | 425ae8a3df3d2378e8da5a96b995f8fc0fac32e8 (diff) |
Merge branch 'al/t2400-depipe' into next
Coding style fix.
* al/t2400-depipe:
t2400: avoid losing exit status to pipes
-rwxr-xr-x | t/t2400-worktree-add.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t2400-worktree-add.sh b/t/t2400-worktree-add.sh index 3742971105..c28c04133c 100755 --- a/t/t2400-worktree-add.sh +++ b/t/t2400-worktree-add.sh @@ -490,7 +490,8 @@ test_expect_success 'put a worktree under rebase' ' cd under-rebase && set_fake_editor && FAKE_LINES="edit 1" git rebase -i HEAD^ && - git worktree list | grep "under-rebase.*detached HEAD" + git worktree list >actual && + grep "under-rebase.*detached HEAD" actual ) ' @@ -531,7 +532,8 @@ test_expect_success 'checkout a branch under bisect' ' git bisect start && git bisect bad && git bisect good HEAD~2 && - git worktree list | grep "under-bisect.*detached HEAD" && + git worktree list >actual && + grep "under-bisect.*detached HEAD" actual && test_must_fail git worktree add new-bisect under-bisect && ! test -d new-bisect ) |