[PATCH v2 10/13] t4014: remove confusing pipe in check_threading()
- From
Denton Liu <liu.denton@gmail.com>
- Date
- Aug 27, 2019, 04:05 UTC
- Message-ID
- <8acc90f74d89301646f8120ebb79eb9170f64743.1566878374.git.liu.denton@gmail.com>
- In-Reply-To
- <cover.1566878373.git.liu.denton@gmail.com>
In check_threading(), there was a Git command in the upstream of a pipe. In order to not lose its status code, it was saved into a file. However, this may be confusing so rewrite to redirect IO to file. This allows us to directly use the conventional &&-chain.
Signed-off-by: Denton Liu <liu.denton@gmail.com> --- t/t4014-format-patch.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 18142ee5fa..67f4c62ed6 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -319,7 +319,7 @@ test_expect_success 'reroll count (-v)' ' check_threading () { expect="$1" && shift && - (git format-patch --stdout "$@"; echo $? >status.out) | + git format-patch --stdout "$@" >patch && # Prints everything between the Message-ID and In-Reply-To, # and replaces all Message-ID-lookalikes by a sequence number perl -ne ' @@ -334,8 +334,7 @@ check_threading () { print; } print "---\n" if /^From /i; - ' >actual && - test 0 = "$(cat status.out)" && + ' <patch >actual && test_cmp "$expect" actual }
-- 2.23.0.248.g3a9dd8fb08