diff options
| author | Amanda Shafack <shafack.likhene@gmail.com> | 2020-10-18 22:48:07 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-18 22:54:11 +0200 |
| commit | a90765bef5556512160b4c302eb7f9dde159130f (patch) | |
| tree | 89ce8ed5ff9f22ddb255d0c0374ee6f201cb6135 /t/t9832-unshelve.sh | |
| parent | Merge tag 'l10n-2.29.0-rnd2' of git://github.com/git-l10n/git-po (diff) | |
| download | git-a90765bef5556512160b4c302eb7f9dde159130f.tar.xz git-a90765bef5556512160b4c302eb7f9dde159130f.zip | |
t2200,t9832: avoid using 'git' upstream in a pipe
Avoid placing `git` upstream in a pipe since doing so throws away
its exit code, thus an unexpected failure may go unnoticed.
Signed-off-by: Amanda Shafack <shafack.likhene@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9832-unshelve.sh')
| -rwxr-xr-x | t/t9832-unshelve.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t9832-unshelve.sh b/t/t9832-unshelve.sh index 7194fb2855..6b3cb0414a 100755 --- a/t/t9832-unshelve.sh +++ b/t/t9832-unshelve.sh @@ -68,7 +68,8 @@ EOF cd "$git" && change=$(last_shelved_change) && git p4 unshelve $change && - git show refs/remotes/p4-unshelved/$change | grep -q "Further description" && + git show refs/remotes/p4-unshelved/$change >actual && + grep -q "Further description" actual && git cherry-pick refs/remotes/p4-unshelved/$change && test_path_is_file file2 && test_cmp file1 "$cli"/file1 && |