Sync with 1.8.4.3

diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index 0f5d7fe23f5b1e15e24e93daed68ece7542cf104..0d7ef847a70581214fb88c3a981581670f7decbe 100644 (file)
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -178,7 +178,7 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
 
        if (1 < opts.index_only + opts.update)
                die("-u and -i at the same time makes no sense");
-       if ((opts.update||opts.index_only) && !opts.merge)
+       if ((opts.update || opts.index_only) && !opts.merge)
                die("%s is meaningless without -m, --reset, or --prefix",
                    opts.update ? "-u" : "-i");
        if ((opts.dir && !opts.update))