am: suppress apply errors when using 3-way

diff --git a/builtin-check-attr.c b/builtin-check-attr.c
index 4921341e33033bb4a2449425d6fd76132a67cd16..8bd043009829fb4bb40cd2f730cbffa27c3791cf 100644 (file)
--- a/builtin-check-attr.c
+++ b/builtin-check-attr.c
@@ -69,8 +69,8 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix)
        int cnt, i, doubledash;
        const char *errstr = NULL;
 
-       argc = parse_options(argc, argv, check_attr_options, check_attr_usage,
-               PARSE_OPT_KEEP_DASHDASH);
+       argc = parse_options(argc, argv, prefix, check_attr_options,
+                            check_attr_usage, PARSE_OPT_KEEP_DASHDASH);
        if (!argc)
                usage_with_options(check_attr_usage, check_attr_options);
 
@@ -97,7 +97,7 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix)
        else if (stdin_paths && doubledash < argc)
                errstr = "Can't specify files with --stdin";
        if (errstr) {
-               error (errstr);
+               error("%s", errstr);
                usage_with_options(check_attr_usage, check_attr_options);
        }