mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
t4253-am-keep-cr-dos: avoid using pipes
The exit code of the upstream in a pipe is ignored thus we should avoid using it. By writing out the output of the git command to a file, we can test the exit codes of both the commands. Signed-off-by: Boxuan Li <liboxuan@connect.hku.hk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
aeb582a983
commit
ce4c7bfc90
|
@ -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
|
||||
'
|
||||
|
||||
|
|
Loading…
Reference in a new issue