diff options
author | Josh Steadmon <steadmon@google.com> | 2022-01-18 20:49:46 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-01-18 22:08:15 (GMT) |
commit | 15f002812f858b49ce7641eb191561843cf31f00 (patch) | |
tree | 0dd6567e4958899495c6adbb6c0829f36e8df961 /builtin/checkout.c | |
parent | 44f14a9d24cd9f04a0a789e58968d52d44d7f332 (diff) | |
download | git-15f002812f858b49ce7641eb191561843cf31f00.zip git-15f002812f858b49ce7641eb191561843cf31f00.tar.gz git-15f002812f858b49ce7641eb191561843cf31f00.tar.bz2 |
branch,checkout: fix --track usage strings
As Ævar pointed out in [1], the use of PARSE_OPT_LITERAL_ARGHELP with a
list of allowed parameters is not recommended. Both git-branch and
git-checkout were changed in d311566 (branch: add flags and config to
inherit tracking, 2021-12-20) to use this discouraged combination for
their --track flags.
Fix this by removing PARSE_OPT_LITERAL_ARGHELP, and changing the arghelp
to simply be "mode". Users may discover allowed values in the manual
pages.
[1]: https://lore.kernel.org/git/220111.86a6g3yqf9.gmgdl@evledraar.gmail.com/
Signed-off-by: Josh Steadmon <steadmon@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/checkout.c')
-rw-r--r-- | builtin/checkout.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 8d511aa..389720a 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -1530,9 +1530,9 @@ static struct option *add_common_switch_branch_options( { struct option options[] = { OPT_BOOL('d', "detach", &opts->force_detach, N_("detach HEAD at named commit")), - OPT_CALLBACK_F('t', "track", &opts->track, "direct|inherit", - N_("set up tracking mode (see git-pull(1))"), - PARSE_OPT_OPTARG | PARSE_OPT_LITERAL_ARGHELP, + OPT_CALLBACK_F('t', "track", &opts->track, N_("mode"), + N_("set branch tracking configuration"), + PARSE_OPT_OPTARG, parse_opt_tracking_mode), OPT__FORCE(&opts->force, N_("force checkout (throw away local modifications)"), PARSE_OPT_NOCOMPLETE), |