diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-11-09 14:06:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-09 14:06:25 -0800 |
| commit | b3ae46a93639e083251b2dd4f1636c2a8df6a46b (patch) | |
| tree | 988c8216eec4929f7c554a2d8d770b8989d4953f /t/t9832-unshelve.sh | |
| parent | Merge branch 'en/dir-rename-tests' (diff) | |
| parent | t2200,t9832: avoid using 'git' upstream in a pipe (diff) | |
| download | tgif-b3ae46a93639e083251b2dd4f1636c2a8df6a46b.tar.xz | |
Merge branch 'as/tests-cleanup'
Micro clean-up of a couple of test scripts.
* as/tests-cleanup:
t2200,t9832: avoid using 'git' upstream in a pipe
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 && |