diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-11-09 22:06:25 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-09 22:06:25 (GMT) |
| commit | b3ae46a93639e083251b2dd4f1636c2a8df6a46b (patch) | |
| tree | 988c8216eec4929f7c554a2d8d770b8989d4953f | |
| parent | 0a1cceb9bd6569848a1ef6dae2794415a446045c (diff) | |
| parent | a90765bef5556512160b4c302eb7f9dde159130f (diff) | |
| download | git-b3ae46a93639e083251b2dd4f1636c2a8df6a46b.zip git-b3ae46a93639e083251b2dd4f1636c2a8df6a46b.tar.gz git-b3ae46a93639e083251b2dd4f1636c2a8df6a46b.tar.bz2 | |
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
| -rwxr-xr-x | t/t2200-add-update.sh | 3 | ||||
| -rwxr-xr-x | t/t9832-unshelve.sh | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh index f764b7e..7cb7a70 100755 --- a/t/t2200-add-update.sh +++ b/t/t2200-add-update.sh @@ -179,7 +179,8 @@ test_expect_success 'add -u resolves unmerged paths' ' test_expect_success '"add -u non-existent" should fail' ' test_must_fail git add -u non-existent && - ! (git ls-files | grep "non-existent") + git ls-files >actual && + ! grep "non-existent" actual ' test_done diff --git a/t/t9832-unshelve.sh b/t/t9832-unshelve.sh index 7194fb2..6b3cb04 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 && |