diff options
| author | Elia Pinto <gitter.spiros@gmail.com> | 2014-06-06 14:55:49 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-09 21:47:06 (GMT) |
| commit | 6f34b79de15f92b53d050598b04444e8421d7b7d (patch) | |
| tree | 43fdf79666ce80315defab02b1afb9d1caaa162b /contrib/examples/git-resolve.sh | |
| parent | cd4de93f2e34ded30bd6b7a7352b45650ad81a83 (diff) | |
| download | git-6f34b79de15f92b53d050598b04444e8421d7b7d.zip git-6f34b79de15f92b53d050598b04444e8421d7b7d.tar.gz git-6f34b79de15f92b53d050598b04444e8421d7b7d.tar.bz2 | |
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>
Diffstat (limited to 'contrib/examples/git-resolve.sh')
| -rwxr-xr-x | contrib/examples/git-resolve.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/examples/git-resolve.sh b/contrib/examples/git-resolve.sh index 48d0fc9..70fdc27 100755 --- a/contrib/examples/git-resolve.sh +++ b/contrib/examples/git-resolve.sh @@ -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 |