[PATCH 4/6] config: use OPT_FILENAME()
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Dec 27, 2018, 15:56 UTC
- Message-ID
- <20181227155611.10585-5-pclouds@gmail.com>
- In-Reply-To
- <20181227155611.10585-1-pclouds@gmail.com>
Do not handle prefix directly. It's simpler to use OPT_FILENAME() instead. The othe reason for doing this is because this code (where the deleted code is) will be factored out and called when "prefix" is not available.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- builtin/config.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/builtin/config.c b/builtin/config.c index 771cfa54bd..c22d25de12 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -126,7 +126,7 @@ static struct option builtin_config_options[] = { OPT_BOOL(0, "system", &use_system_config, N_("use system config file")), OPT_BOOL(0, "local", &use_local_config, N_("use repository config file")), OPT_BOOL(0, "worktree", &use_worktree_config, N_("use per-worktree config file")), - OPT_STRING('f', "file", &given_config_source.file, N_("file"), N_("use given config file")), + OPT_FILENAME('f', "file", &given_config_source.file, N_("use given config file")), OPT_STRING(0, "blob", &given_config_source.blob, N_("blob-id"), N_("read config from given blob object")), OPT_GROUP(N_("Action")), OPT_BIT(0, "get", &actions, N_("get value: name [value-regex]"), ACTION_GET), @@ -657,10 +657,6 @@ int cmd_config(int argc, const char **argv, const char *prefix) "extension worktreeConfig is enabled. " "Please read \"CONFIGURATION FILE\"\n" "section in \"git help worktree\" for details")); - } else if (given_config_source.file) { - if (!is_absolute_path(given_config_source.file) && prefix) - given_config_source.file = - prefix_filename(prefix, given_config_source.file); } if (respect_includes_opt == -1)
-- 2.20.0.482.g66447595a7