aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-06-09 11:55:59 -0400
committerJunio C Hamano <gitster@pobox.com>2011-06-22 11:25:20 -0700
commit615ff912c5b30f70d5b0d1f6d6764327a3ecd337 (patch)
tree9b8bde869d523cc1d523eb89070773435840b833
parentc8ba163916554e9ffd3ce8cb2beeff003d90c0c3 (diff)
downloadgit-615ff912c5b30f70d5b0d1f6d6764327a3ecd337.tar.gz
git-615ff912c5b30f70d5b0d1f6d6764327a3ecd337.tar.xz
remote: use new OPT_STRING_LIST
This saves us having our own callback function. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/remote.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/builtin/remote.c b/builtin/remote.c
index 842415226..82cd59e30 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -88,16 +88,6 @@ static inline int postfixcmp(const char *string, const char *postfix)
return strcmp(string + len1 - len2, postfix);
}
-static int opt_parse_track(const struct option *opt, const char *arg, int not)
-{
- struct string_list *list = opt->value;
- if (not)
- string_list_clear(list, 0);
- else
- string_list_append(list, arg);
- return 0;
-}
-
static int fetch_remote(const char *name)
{
const char *argv[] = { "fetch", name, NULL, NULL };
@@ -176,8 +166,8 @@ static int add(int argc, const char **argv)
TAGS_SET),
OPT_SET_INT(0, NULL, &fetch_tags,
"or do not fetch any tag at all (--no-tags)", TAGS_UNSET),
- OPT_CALLBACK('t', "track", &track, "branch",
- "branch(es) to track", opt_parse_track),
+ OPT_STRING_LIST('t', "track", &track, "branch",
+ "branch(es) to track"),
OPT_STRING('m', "master", &master, "branch", "master branch"),
{ OPTION_CALLBACK, 0, "mirror", &mirror, "push|fetch",
"set up remote as a mirror to push to or fetch from",