| commit | 57b74cdaba2aaaee7d29838a7e6f3ed5581b1992 | |
| author | Elia Pinto <gitter.spiros@gmail.com> | |
| Fri, 6 Jun 2014 14:55:47 +0000 (6 07:55 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 9 Jun 2014 21:47:06 +0000 (9 14:47 -0700) | ||
| tree | f7633b003d9e1707d44fc38c8018d4fed7526609 | treesnapshot (tar.gz zip) |
| parent | 0783df5d2603c97a481be839bdc65088787dde1b | commitdiff |
contrib/examples/git-merge.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>
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>
| contrib/examples/git-merge.sh | diffblobblamehistory |