use logical OR (||) instead of binary OR (|) in logical context
commit0b437a18bdd188794cec8855e2a413921d08b6e8
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>
Thu, 13 Jun 2013 18:19:44 +0000 (13 20:19 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 13 Jun 2013 21:47:07 +0000 (13 14:47 -0700)
tree7405fbdab450ad716441275c51cf7c2e831e02ce
parentf2b4626d9e78e00d2168a8470633d6c7f5331a13
use logical OR (||) instead of binary OR (|) in logical context

The compiler can short-circuit the evaluation of conditions strung
together with logical OR operators instead of computing the resulting
bitmask with binary ORs.  More importantly, this patch makes the
intent of the changed code clearer, because the logical context (as
opposed to binary context) becomes immediately obvious.

While we're at it, simplify the check for patch->is_rename in
builtin/apply.c a bit; it can only be 0 or 1, so we don't need a
comparison operator.

Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/apply.c
builtin/ls-files.c
builtin/merge-base.c