[PATCH 3/4] option-strings: use OPT_PATH
- From
Michael J Gruber <git@drmicha.warpmail.net>
- Date
- Feb 23, 2015, 16:17 UTC
- Message-ID
- <9030a1bb1e7a03eedfd65432fabf385f457419d6.1424707497.git.git@drmicha.warpmail.net>
- In-Reply-To
- <20150223144214.GA31624@peff.net>
Some commands use OPT_STRING to specify a path type argument. Let them use OPT_PATH so that they can profit from path prefixing.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> --- builtin/clone.c | 4 ++-- builtin/init-db.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/builtin/clone.c b/builtin/clone.c index a9af3f2..15941c5 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -80,7 +80,7 @@ static struct option builtin_clone_options[] = { N_("initialize submodules in the clone")), OPT_BOOL(0, "recurse-submodules", &option_recursive, N_("initialize submodules in the clone")), - OPT_STRING(0, "template", &option_template, N_("template-directory"), + OPT_PATH(0, "template", &option_template, N_("template-directory"), N_("directory from which templates will be used")), OPT_CALLBACK(0 , "reference", &option_reference, N_("repo"), N_("reference repository"), &opt_parse_reference), @@ -94,7 +94,7 @@ static struct option builtin_clone_options[] = { N_("create a shallow clone of that depth")), OPT_BOOL(0, "single-branch", &option_single_branch, N_("clone only one branch, HEAD or --branch")), - OPT_STRING(0, "separate-git-dir", &real_git_dir, N_("gitdir"), + OPT_PATH(0, "separate-git-dir", &real_git_dir, N_("gitdir"), N_("separate git dir from working tree")), OPT_STRING_LIST('c', "config", &option_config, N_("key=value"), N_("set config inside the new repository")), diff --git a/builtin/init-db.c b/builtin/init-db.c index 6b7fa5f..262c9ae 100644 --- a/builtin/init-db.c +++ b/builtin/init-db.c @@ -477,7 +477,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix) const char *template_dir = NULL; unsigned int flags = 0; const struct option init_db_options[] = { - OPT_STRING(0, "template", &template_dir, N_("template-directory"), + OPT_PATH(0, "template", &template_dir, N_("template-directory"), N_("directory from which templates will be used")), OPT_SET_INT(0, "bare", &is_bare_repository_cfg, N_("create a bare repository"), 1), @@ -486,7 +486,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix) N_("specify that the git repository is to be shared amongst several users"), PARSE_OPT_OPTARG | PARSE_OPT_NONEG, shared_callback, 0}, OPT_BIT('q', "quiet", &flags, N_("be quiet"), INIT_DB_QUIET), - OPT_STRING(0, "separate-git-dir", &real_git_dir, N_("gitdir"), + OPT_PATH(0, "separate-git-dir", &real_git_dir, N_("gitdir"), N_("separate git dir from working tree")), OPT_END() };
-- 2.3.0.296.g32c87e1