summaryrefslogtreecommitdiff
path: root/builtin/branch.c
diff options
context:
space:
mode:
authorJosh Steadmon <steadmon@google.com>2022-01-18 12:49:46 -0800
committerJunio C Hamano <gitster@pobox.com>2022-01-18 14:08:15 -0800
commit15f002812f858b49ce7641eb191561843cf31f00 (patch)
tree0dd6567e4958899495c6adbb6c0829f36e8df961 /builtin/branch.c
parent44f14a9d24cd9f04a0a789e58968d52d44d7f332 (diff)
downloadgit-15f002812f858b49ce7641eb191561843cf31f00.tar.gz
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/branch.c')
-rw-r--r--builtin/branch.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/branch.c b/builtin/branch.c
index 1890afd4e5..2e897fef14 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -632,9 +632,9 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
OPT__VERBOSE(&filter.verbose,
N_("show hash and subject, give twice for upstream branch")),
OPT__QUIET(&quiet, N_("suppress informational messages")),
- OPT_CALLBACK_F('t', "track", &track, "direct|inherit",
+ OPT_CALLBACK_F('t', "track", &track, N_("mode"),
N_("set branch tracking configuration"),
- PARSE_OPT_OPTARG | PARSE_OPT_LITERAL_ARGHELP,
+ PARSE_OPT_OPTARG,
parse_opt_tracking_mode),
OPT_SET_INT_F(0, "set-upstream", &track, N_("do not use"),
BRANCH_TRACK_OVERRIDE, PARSE_OPT_HIDDEN),