test-lint: only use only sed [-n] [-e command] [-f command_file]

diff --git a/ref-filter.c b/ref-filter.c
index a1290659afc730f0345d2586fffad4f9a39a658f..5de616befe46e64b014ebe7c3feb5913bc8af2df 100644 (file)
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -882,7 +882,7 @@ static void grab_common_values(struct atom_value *val, int deref, struct expand_
                        v->s = xstrdup(type_name(oi->type));
                else if (!strcmp(name, "objectsize")) {
                        v->value = oi->size;
-                       v->s = xstrfmt("%lu", oi->size);
+                       v->s = xstrfmt("%"PRIuMAX , (uintmax_t)oi->size);
                }
                else if (deref)
                        grab_objectname(name, &oi->oid, v, &used_atom[i]);
@@ -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);