diff options
Diffstat (limited to 'builtin-merge.c')
| -rw-r--r-- | builtin-merge.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/builtin-merge.c b/builtin-merge.c index 129b4e62dd..e97c79e60c 100644 --- a/builtin-merge.c +++ b/builtin-merge.c @@ -50,11 +50,9 @@ static size_t use_strategies_nr, use_strategies_alloc; static const char *branch; static struct strategy all_strategy[] = { - { "recur", NO_TRIVIAL }, { "recursive", DEFAULT_TWOHEAD | NO_TRIVIAL }, { "octopus", DEFAULT_OCTOPUS }, { "resolve", 0 }, - { "stupid", 0 }, { "ours", NO_FAST_FORWARD | NO_TRIVIAL }, { "subtree", NO_FAST_FORWARD | NO_TRIVIAL }, }; @@ -68,10 +66,11 @@ static int option_parse_message(const struct option *opt, if (unset) strbuf_setlen(buf, 0); - else { + else if (arg) { strbuf_addf(buf, "%s\n\n", arg); have_message = 1; - } + } else + return error("switch `m' requires a value"); return 0; } |