rebase: update `--empty=ask` to `--empty=stop`

[thirdparty/git.git] / builtin / rebase.c

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 6ead9465a42c6d3c6ff7a547bb42ed9dd919dd90..ab3e187473196f5bc80edab8cd642e3e29d37463 100644 (file)
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -58,7 +58,7 @@ enum empty_type {
        EMPTY_UNSPECIFIED = -1,
        EMPTY_DROP,
        EMPTY_KEEP,
-       EMPTY_ASK
+       EMPTY_STOP
 };
 
 enum action {
@@ -951,10 +951,14 @@ static enum empty_type parse_empty_value(const char *value)
                return EMPTY_DROP;
        else if (!strcasecmp(value, "keep"))
                return EMPTY_KEEP;
-       else if (!strcasecmp(value, "ask"))
-               return EMPTY_ASK;
+       else if (!strcasecmp(value, "stop"))
+               return EMPTY_STOP;
+       else if (!strcasecmp(value, "ask")) {
+               warning(_("--empty=ask is deprecated; use '--empty=stop' instead."));
+               return EMPTY_STOP;
+       }
 
-       die(_("unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask\"."), value);
+       die(_("unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"stop\"."), value);
 }
 
 static int parse_opt_keep_empty(const struct option *opt, const char *arg,
@@ -1133,7 +1137,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
                                 "instead of ignoring them"),
                              1, PARSE_OPT_HIDDEN),
                OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),
-               OPT_CALLBACK_F(0, "empty", &options, "(drop|keep|ask)",
+               OPT_CALLBACK_F(0, "empty", &options, "(drop|keep|stop)",
                               N_("how to handle commits that become empty"),
                               PARSE_OPT_NONEG, parse_opt_empty),
                OPT_CALLBACK_F('k', "keep-empty", &options, NULL,
@@ -1550,7 +1554,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 
        if (options.empty == EMPTY_UNSPECIFIED) {
                if (options.flags & REBASE_INTERACTIVE_EXPLICIT)
-                       options.empty = EMPTY_ASK;
+                       options.empty = EMPTY_STOP;
                else if (options.exec.nr > 0)
                        options.empty = EMPTY_KEEP;
                else