[PATCH 1/3] clone: use OPT_STRING_LIST for --reference
- From
Jeff King <peff@peff.net>
- Date
- May 21, 2015, 04:15 UTC
- Message-ID
- <20150521041519.GA5196@peff.net>
- In-Reply-To
- <20150521041435.GA18978@peff.net>
Not only does this save us having to implement a custom callback, but it handles "--no-reference" in the usual way (to clear the list).
The generic callback does copy the string, which we don't technically need, but that should not hurt anything.
Signed-off-by: Jeff King <peff@peff.net> --- builtin/clone.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/builtin/clone.c b/builtin/clone.c index 166a645..1426ef5 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -51,15 +51,6 @@ static struct string_list option_config; static struct string_list option_reference; static int option_dissociate; -static int opt_parse_reference(const struct option *opt, const char *arg, int unset) -{ - struct string_list *option_reference = opt->value; - if (!arg) - return -1; - string_list_append(option_reference, arg); - return 0; -} - static struct option builtin_clone_options[] = { OPT__VERBOSITY(&option_verbosity), OPT_BOOL(0, "progress", &option_progress, @@ -83,8 +74,8 @@ static struct option builtin_clone_options[] = { N_("initialize submodules in the clone")), OPT_STRING(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), + OPT_STRING_LIST(0, "reference", &option_reference, N_("repo"), + N_("reference repository")), OPT_STRING('o', "origin", &option_origin, N_("name"), N_("use <name> instead of 'origin' to track upstream")), OPT_STRING('b', "branch", &option_branch, N_("branch"),
-- 2.4.1.528.g00591e3