Merge branch 'sb/misc-fixes'

diff --git a/builtin/merge-base.c b/builtin/merge-base.c
index 1bc79910481e6ee04b470620da5609c1c6fbcac4..0c4cd2f9f792cdf47cecf3401eb2bf7c676f7f6e 100644 (file)
--- a/builtin/merge-base.c
+++ b/builtin/merge-base.c
@@ -107,7 +107,7 @@ int cmd_merge_base(int argc, const char **argv, const char *prefix)
        argc = parse_options(argc, argv, prefix, options, merge_base_usage, 0);
        if (!octopus && !reduce && argc < 2)
                usage_with_options(merge_base_usage, options);
-       if (is_ancestor && (show_all | octopus | reduce))
+       if (is_ancestor && (show_all || octopus || reduce))
                die("--is-ancestor cannot be used with other options");
        if (is_ancestor)
                return handle_is_ancestor(argc, argv);