add, update-index: fix --chmod argument help
Don't translate the argument specification for --chmod; "+x" and "-x" are the literal strings that the commands accept. Separate alternatives using a pipe character instead of a slash, for consistency. Use the flag PARSE_OPT_LITERAL_ARGHELP to prevent parseopt from adding a pair of angular brackets around the argument help string, as that would wrongly indicate that users need to replace the literal strings with some kind of value. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Scharfe committed
Aug 2, 2018 at 21:17 UTC
8b5ebbed0e793f6fcf92100e600b7a4bdd6452e9
2 files changed
+4
-2
builtin/add.c
+3
-1
@@ -306,7 +306,9 @@ static struct option builtin_add_options[] = {
306
OPT_BOOL( 0 , "refresh", &refresh_only, N_("don't add, only refresh the index")),
307
OPT_BOOL( 0 , "ignore-errors", &ignore_add_errors, N_("just skip files which cannot be added because of errors")),
308
OPT_BOOL( 0 , "ignore-missing", &ignore_missing, N_("check if - even missing - files are ignored in dry run")),
309
- OPT_STRING( 0 , "chmod", &chmod_arg, N_("(+/-)x"), N_("override the executable bit of the listed files")),
309
+ { OPTION_STRING, 0, "chmod", &chmod_arg, "(+|-)x",
310
+ N_("override the executable bit of the listed files"),
311
+ PARSE_OPT_LITERAL_ARGHELP },
312
OPT_HIDDEN_BOOL(0, "warn-embedded-repo", &warn_on_embedded_repo,
313
N_("warn when adding an embedded repository")),
314
OPT_END(),
builtin/update-index.c
+1
-1
@@ -970,7 +970,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
970
PARSE_OPT_NOARG | /* disallow --cacheinfo=<mode> form */
971
PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP,
972
(parse_opt_cb *) cacheinfo_callback},
973
- {OPTION_CALLBACK, 0, "chmod", &set_executable_bit, N_("(+/-)x"),
973
+ {OPTION_CALLBACK, 0, "chmod", &set_executable_bit, "(+|-)x",
974
N_("override the executable bit of the listed files"),
975
PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP,
976
chmod_callback},