mirror of
https://github.com/git/git
synced 2024-09-29 21:27:13 +00:00
global: convert trivial usages of test <expr> -a/-o <expr>
Our coding guidelines say to not use `test` with `-a` and `-o` because it can easily lead to bugs. Convert trivial cases where we still use these to instead instead concatenate multiple invocations of `test` via `&&` and `||`, respectively. While not all of the converted instances can cause ambiguity, it is worth getting rid of all of them regardless: - It becomes easier to reason about the code as we do not have to argue why one use of `-a`/`-o` is okay while another one isn't. - We don't encourage people to use these expressions. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
dadef801b3
commit
13420028e5
|
@ -11,7 +11,7 @@ LF='
|
||||||
if test -f version
|
if test -f version
|
||||||
then
|
then
|
||||||
VN=$(cat version) || VN="$DEF_VER"
|
VN=$(cat version) || VN="$DEF_VER"
|
||||||
elif test -d ${GIT_DIR:-.git} -o -f .git &&
|
elif { test -d "${GIT_DIR:-.git}" || test -f .git; } &&
|
||||||
VN=$(git describe --match "v[0-9]*" HEAD 2>/dev/null) &&
|
VN=$(git describe --match "v[0-9]*" HEAD 2>/dev/null) &&
|
||||||
case "$VN" in
|
case "$VN" in
|
||||||
*$LF*) (exit 1) ;;
|
*$LF*) (exit 1) ;;
|
||||||
|
|
|
@ -94,7 +94,7 @@ AC_DEFUN([GIT_PARSE_WITH_SET_MAKE_VAR],
|
||||||
[AC_ARG_WITH([$1],
|
[AC_ARG_WITH([$1],
|
||||||
[AS_HELP_STRING([--with-$1=VALUE], $3)],
|
[AS_HELP_STRING([--with-$1=VALUE], $3)],
|
||||||
if test -n "$withval"; then
|
if test -n "$withval"; then
|
||||||
if test "$withval" = "yes" -o "$withval" = "no"; then
|
if test "$withval" = "yes" || test "$withval" = "no"; then
|
||||||
AC_MSG_WARN([You likely do not want either 'yes' or 'no' as]
|
AC_MSG_WARN([You likely do not want either 'yes' or 'no' as]
|
||||||
[a value for $1 ($2). Maybe you do...?])
|
[a value for $1 ($2). Maybe you do...?])
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -489,13 +489,13 @@ find_existing_splits () {
|
||||||
;;
|
;;
|
||||||
END)
|
END)
|
||||||
debug "Main is: '$main'"
|
debug "Main is: '$main'"
|
||||||
if test -z "$main" -a -n "$sub"
|
if test -z "$main" && test -n "$sub"
|
||||||
then
|
then
|
||||||
# squash commits refer to a subtree
|
# squash commits refer to a subtree
|
||||||
debug " Squash: $sq from $sub"
|
debug " Squash: $sq from $sub"
|
||||||
cache_set "$sq" "$sub"
|
cache_set "$sq" "$sub"
|
||||||
fi
|
fi
|
||||||
if test -n "$main" -a -n "$sub"
|
if test -n "$main" && test -n "$sub"
|
||||||
then
|
then
|
||||||
debug " Prior: $main -> $sub"
|
debug " Prior: $main -> $sub"
|
||||||
cache_set $main $sub
|
cache_set $main $sub
|
||||||
|
|
|
@ -31,7 +31,7 @@ unset GIT_CONFIG_NOSYSTEM
|
||||||
GIT_CONFIG_SYSTEM="$TEST_DIRECTORY/perf/config"
|
GIT_CONFIG_SYSTEM="$TEST_DIRECTORY/perf/config"
|
||||||
export GIT_CONFIG_SYSTEM
|
export GIT_CONFIG_SYSTEM
|
||||||
|
|
||||||
if test -n "$GIT_TEST_INSTALLED" -a -z "$PERF_SET_GIT_TEST_INSTALLED"
|
if test -n "$GIT_TEST_INSTALLED" && test -z "$PERF_SET_GIT_TEST_INSTALLED"
|
||||||
then
|
then
|
||||||
error "Do not use GIT_TEST_INSTALLED with the perf tests.
|
error "Do not use GIT_TEST_INSTALLED with the perf tests.
|
||||||
|
|
||||||
|
|
|
@ -91,10 +91,10 @@ set_git_test_installed () {
|
||||||
run_dirs_helper () {
|
run_dirs_helper () {
|
||||||
mydir=${1%/}
|
mydir=${1%/}
|
||||||
shift
|
shift
|
||||||
while test $# -gt 0 -a "$1" != -- -a ! -f "$1"; do
|
while test $# -gt 0 && test "$1" != -- && test ! -f "$1"; do
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
if test $# -gt 0 -a "$1" = --; then
|
if test $# -gt 0 && test "$1" = --; then
|
||||||
shift
|
shift
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -124,7 +124,7 @@ run_dirs_helper () {
|
||||||
}
|
}
|
||||||
|
|
||||||
run_dirs () {
|
run_dirs () {
|
||||||
while test $# -gt 0 -a "$1" != -- -a ! -f "$1"; do
|
while test $# -gt 0 && test "$1" != -- && test ! -f "$1"; do
|
||||||
run_dirs_helper "$@"
|
run_dirs_helper "$@"
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
|
@ -180,7 +180,8 @@ run_subsection () {
|
||||||
GIT_PERF_AGGREGATING_LATER=t
|
GIT_PERF_AGGREGATING_LATER=t
|
||||||
export GIT_PERF_AGGREGATING_LATER
|
export GIT_PERF_AGGREGATING_LATER
|
||||||
|
|
||||||
if test $# = 0 -o "$1" = -- -o -f "$1"; then
|
if test $# = 0 || test "$1" = -- || test -f "$1"
|
||||||
|
then
|
||||||
set -- . "$@"
|
set -- . "$@"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@ memcheck)
|
||||||
VALGRIND_MAJOR=$(expr "$VALGRIND_VERSION" : '[^0-9]*\([0-9]*\)')
|
VALGRIND_MAJOR=$(expr "$VALGRIND_VERSION" : '[^0-9]*\([0-9]*\)')
|
||||||
VALGRIND_MINOR=$(expr "$VALGRIND_VERSION" : '[^0-9]*[0-9]*\.\([0-9]*\)')
|
VALGRIND_MINOR=$(expr "$VALGRIND_VERSION" : '[^0-9]*[0-9]*\.\([0-9]*\)')
|
||||||
test 3 -gt "$VALGRIND_MAJOR" ||
|
test 3 -gt "$VALGRIND_MAJOR" ||
|
||||||
test 3 -eq "$VALGRIND_MAJOR" -a 4 -gt "$VALGRIND_MINOR" ||
|
{ test 3 -eq "$VALGRIND_MAJOR" && test 4 -gt "$VALGRIND_MINOR"; } ||
|
||||||
TOOL_OPTIONS="$TOOL_OPTIONS --track-origins=yes"
|
TOOL_OPTIONS="$TOOL_OPTIONS --track-origins=yes"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
|
Loading…
Reference in a new issue