mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"
The construct is error-prone; "test" being built-in in most modern shells, the reason to avoid "test <cond> && test <cond>" spawning one extra process by using a single "test <cond> -a <cond>" no longer exists. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
cd4de93f2e
commit
6f34b79de1
|
@ -76,7 +76,7 @@ case "$common" in
|
|||
2>/dev/null || continue
|
||||
# Count the paths that are unmerged.
|
||||
cnt=$(GIT_INDEX_FILE=$G git ls-files --unmerged | wc -l)
|
||||
if test $best_cnt -le 0 -o $cnt -le $best_cnt
|
||||
if test $best_cnt -le 0 || test $cnt -le $best_cnt
|
||||
then
|
||||
best=$c
|
||||
best_cnt=$cnt
|
||||
|
|
Loading…
Reference in a new issue