am: suppress apply errors when using 3-way

diff --git a/builtin-log.c b/builtin-log.c
index c8c620827587f14c4ff3314572c0dd01a4a4cfe3..0d34050556855d6bab8b4c4121e833cc326324df 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -936,7 +936,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
         * like "git format-patch -o a123 HEAD^.." may fail; a123 is
         * possibly a valid SHA1.
         */
-       argc = parse_options(argc, argv, builtin_format_patch_options,
+       argc = parse_options(argc, argv, prefix, builtin_format_patch_options,
                             builtin_format_patch_usage,
                             PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN);