summaryrefslogtreecommitdiff
path: root/builtin/read-tree.c
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2018-08-02 19:18:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-08-03 15:36:20 (GMT)
commit5f0df44cd79a953c287ccb598896ea7aaa2cc9e3 (patch)
treed438018d4b5dec908b60bd46913e36a8e6304ade /builtin/read-tree.c
parentb8ade4c5766774207e05c8f92e262f8f6835bd3d (diff)
downloadgit-5f0df44cd79a953c287ccb598896ea7aaa2cc9e3.zip
git-5f0df44cd79a953c287ccb598896ea7aaa2cc9e3.tar.gz
git-5f0df44cd79a953c287ccb598896ea7aaa2cc9e3.tar.bz2
parse-options: automatically infer PARSE_OPT_LITERAL_ARGHELP
Parseopt wraps argument help strings in a pair of angular brackets by default, to tell users that they need to replace it with an actual value. This is useful in most cases, because most option arguments are indeed single values of a certain type. The option PARSE_OPT_LITERAL_ARGHELP needs to be used in option definitions with arguments that have multiple parts or are literal strings. Stop adding these angular brackets if special characters are present, as they indicate that we don't deal with a simple placeholder. This simplifies the code a bit and makes defining special options slightly easier. Remove the flag PARSE_OPT_LITERAL_ARGHELP in the cases where the new and more cautious handling suffices. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/read-tree.c')
-rw-r--r--builtin/read-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index bf87a27..3a7fd63 100644
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -134,7 +134,7 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
N_("same as -m, but discard unmerged entries")),
{ OPTION_STRING, 0, "prefix", &opts.prefix, N_("<subdirectory>/"),
N_("read the tree into the index under <subdirectory>/"),
- PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP },
+ PARSE_OPT_NONEG },
OPT_BOOL('u', NULL, &opts.update,
N_("update working tree with merge result")),
{ OPTION_CALLBACK, 0, "exclude-per-directory", &opts,