Merge branch 'jc/parse-options-reset'

Command line parser fix.

* jc/parse-options-reset:
  reset: reject --no-(mixed|soft|hard|merge|keep) option

diff --git a/builtin/reset.c b/builtin/reset.c
index 7f18dc03b8fc701adf353df62389ca57d557c84b..4b018d20e3b2200e44a04f1f759837a571e4bc4f 100644 (file)
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -338,18 +338,25 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
                OPT__QUIET(&quiet, N_("be quiet, only report errors")),
                OPT_BOOL(0, "no-refresh", &no_refresh,
                                N_("skip refreshing the index after reset")),
-               OPT_SET_INT(0, "mixed", &reset_type,
-                                               N_("reset HEAD and index"), MIXED),
-               OPT_SET_INT(0, "soft", &reset_type, N_("reset only HEAD"), SOFT),
-               OPT_SET_INT(0, "hard", &reset_type,
-                               N_("reset HEAD, index and working tree"), HARD),
-               OPT_SET_INT(0, "merge", &reset_type,
-                               N_("reset HEAD, index and working tree"), MERGE),
-               OPT_SET_INT(0, "keep", &reset_type,
-                               N_("reset HEAD but keep local changes"), KEEP),
+               OPT_SET_INT_F(0, "mixed", &reset_type,
+                             N_("reset HEAD and index"),
+                             MIXED, PARSE_OPT_NONEG),
+               OPT_SET_INT_F(0, "soft", &reset_type,
+                             N_("reset only HEAD"),
+                             SOFT, PARSE_OPT_NONEG),
+               OPT_SET_INT_F(0, "hard", &reset_type,
+                             N_("reset HEAD, index and working tree"),
+                             HARD, PARSE_OPT_NONEG),
+               OPT_SET_INT_F(0, "merge", &reset_type,
+                             N_("reset HEAD, index and working tree"),
+                             MERGE, PARSE_OPT_NONEG),
+               OPT_SET_INT_F(0, "keep", &reset_type,
+                             N_("reset HEAD but keep local changes"),
+                             KEEP, PARSE_OPT_NONEG),
                OPT_CALLBACK_F(0, "recurse-submodules", NULL,
-                           "reset", "control recursive updating of submodules",
-                           PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater),
+                              "reset", "control recursive updating of submodules",
+                              PARSE_OPT_OPTARG,
+                              option_parse_recurse_submodules_worktree_updater),
                OPT_BOOL('p', "patch", &patch_mode, N_("select hunks interactively")),
                OPT_BOOL('N', "intent-to-add", &intent_to_add,
                                N_("record only the fact that removed paths will be added later")),

diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index 22477f3a312e4a44b0c3f99ee356d29487ed5399..4287863ae6cab9a67564c9328effd68d2c186ab6 100755 (executable)
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -71,6 +71,16 @@ check_changes () {
        done | test_cmp .cat_expect -
 }
 
+# no negated form for various type of resets
+for opt in soft mixed hard merge keep
+do
+       test_expect_success "no 'git reset --no-$opt'" '
+               test_when_finished "rm -f err" &&
+               test_must_fail git reset --no-$opt 2>err &&
+               grep "error: unknown option .no-$opt." err
+       '
+done
+
 test_expect_success 'reset --hard message' '
        hex=$(git log -1 --format="%h") &&
        git reset --hard >.actual &&