diff-parseopt: convert --[src|dst]-prefix

diff --git a/builtin/merge.c b/builtin/merge.c
index 07839b0bb8f922e5bab1757c8739b2c20082a874..563a16f38a50e13144279925442b7ab491c87f58 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -112,12 +112,15 @@ static int option_parse_message(const struct option *opt,
        return 0;
 }
 
-static int option_read_message(struct parse_opt_ctx_t *ctx,
-                              const struct option *opt, int unset)
+static enum parse_opt_result option_read_message(struct parse_opt_ctx_t *ctx,
+                                                const struct option *opt,
+                                                const char *arg_not_used,
+                                                int unset)
 {
        struct strbuf *buf = opt->value;
        const char *arg;
 
+       BUG_ON_OPT_ARG(arg_not_used);
        if (unset)
                BUG("-F cannot be negated");