diff options
author | Jiang Xin <zhiyou.jx@alibaba-inc.com> | 2022-11-25 17:59:52 +0800 |
---|---|---|
committer | Johannes Schindelin <johannes.schindelin@gmx.de> | 2023-03-12 20:31:53 +0100 |
commit | 20854bc47ae071d54f8aa71de948da5084e3adc7 (patch) | |
tree | 25b72becab8ec1f2d249eed07cb288f4dcdc4b4c | |
parent | c03ffcff4e84f4d1e05a86540cd541c759242fc8 (diff) | |
download | git-20854bc47ae071d54f8aa71de948da5084e3adc7.tar.gz |
ci: remove the pipe after "p4 -V" to catch errors
When installing p4 as a dependency, we used to pipe output of "p4 -V"
and "p4d -V" to validate the installation and output a condensed version
information. But this would hide potential errors of p4 and would stop
with an empty output. E.g.: p4d version 16.2 running on ubuntu 22.04
causes sigfaults, even before it produces any output.
By removing the pipe after "p4 -V" and "p4d -V", we may get a
verbose output, and stop immediately on errors because we have "set
-e" in "ci/lib.sh". Since we won't look at these trace logs unless
something fails, just including the raw output seems most sensible.
Reviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-x | ci/install-dependencies.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 0b1184e04a..309b8b164e 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -81,9 +81,9 @@ esac if type p4d >/dev/null && type p4 >/dev/null then echo "$(tput setaf 6)Perforce Server Version$(tput sgr0)" - p4d -V | grep Rev. + p4d -V echo "$(tput setaf 6)Perforce Client Version$(tput sgr0)" - p4 -V | grep Rev. + p4 -V fi if type git-lfs >/dev/null then |