Merge branch 'sg/ref-filter-wo-repository'

diff --git a/ref-filter.c b/ref-filter.c
index a1290659afc730f0345d2586fffad4f9a39a658f..6c70d797a978077e27c13da7291e29c3947d3961 100644 (file)
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -2320,6 +2320,8 @@ int parse_opt_merge_filter(const struct option *opt, const char *arg, int unset)
        struct object_id oid;
        int no_merged = starts_with(opt->long_name, "no");
 
+       BUG_ON_OPT_NEG(unset);
+
        if (rf->merge) {
                if (no_merged) {
                        return opterror(opt, "is incompatible with --merged", 0);