mirror of
https://github.com/git/git
synced 2024-10-29 17:08:46 +00:00
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>
This commit is contained in:
parent
0178420b9c
commit
4137c84198
1 changed files with 2 additions and 2 deletions
|
@ -83,9 +83,9 @@ esac
|
||||||
if type p4d >/dev/null 2>&1 && type p4 >/dev/null 2>&1
|
if type p4d >/dev/null 2>&1 && type p4 >/dev/null 2>&1
|
||||||
then
|
then
|
||||||
echo "$(tput setaf 6)Perforce Server Version$(tput sgr0)"
|
echo "$(tput setaf 6)Perforce Server Version$(tput sgr0)"
|
||||||
p4d -V | grep Rev.
|
p4d -V
|
||||||
echo "$(tput setaf 6)Perforce Client Version$(tput sgr0)"
|
echo "$(tput setaf 6)Perforce Client Version$(tput sgr0)"
|
||||||
p4 -V | grep Rev.
|
p4 -V
|
||||||
else
|
else
|
||||||
echo >&2 "WARNING: perforce wasn't installed, see above for clues why"
|
echo >&2 "WARNING: perforce wasn't installed, see above for clues why"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue