diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-05-19 16:45:31 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-19 16:45:31 +0900 |
| commit | 717dad8ebc25ccfff00d078aeb56f91503a77d36 (patch) | |
| tree | aa3add281768b5d64aed65e93d8cd03801777a99 | |
| parent | Merge branch 'ds/midx-too-many-packs' (diff) | |
| parent | t4253-am-keep-cr-dos: avoid using pipes (diff) | |
| download | tgif-717dad8ebc25ccfff00d078aeb56f91503a77d36.tar.xz | |
Merge branch 'bl/t4253-exit-code-from-format-patch'
Avoid patterns to pipe output from a git command to feed another
command in tests.
* bl/t4253-exit-code-from-format-patch:
t4253-am-keep-cr-dos: avoid using pipes
| -rwxr-xr-x | t/t4253-am-keep-cr-dos.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t4253-am-keep-cr-dos.sh b/t/t4253-am-keep-cr-dos.sh index 553fe3e88e..6e1b73ec3a 100755 --- a/t/t4253-am-keep-cr-dos.sh +++ b/t/t4253-am-keep-cr-dos.sh @@ -51,14 +51,16 @@ test_expect_success 'am with dos files without --keep-cr' ' test_expect_success 'am with dos files with --keep-cr' ' git checkout -b dosfiles-keep-cr initial && - git format-patch -k --stdout initial..master | git am --keep-cr -k -3 && + git format-patch -k --stdout initial..master >output && + git am --keep-cr -k -3 output && git diff --exit-code master ' test_expect_success 'am with dos files config am.keepcr' ' git config am.keepcr 1 && git checkout -b dosfiles-conf-keepcr initial && - git format-patch -k --stdout initial..master | git am -k -3 && + git format-patch -k --stdout initial..master >output && + git am -k -3 output && git diff --exit-code master ' |