mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

parse-opts: prepare for OPT_FILENAME

Browse Source 
To give OPT_FILENAME the prefix, we pass the prefix to parse_options()
which passes the prefix to parse_options_start() which sets the prefix
member of parse_opts_ctx accordingly. If there isn't a prefix in the
calling context, passing NULL will suffice.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stephen Boyd
2009-05-23 11:53:12 -07:00
committed by Junio C Hamano
parent 3d09e64ac1
commit 3778292017
51 changed files with 86 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
builtin-remote.c
View File

@ -79,7 +79,8 @@ static int add(int argc, const char **argv)
OPT_END()
};
argc = parse_options(argc, argv, options, builtin_remote_usage, 0);
argc = parse_options(argc, argv, NULL, options, builtin_remote_usage,
0);
if (argc < 2)
usage_with_options(builtin_remote_usage, options);
@ -986,7 +987,8 @@ static int show(int argc, const char **argv)
struct string_list info_list = { NULL, 0, 0, 0 };
struct show_info info;
argc = parse_options(argc, argv, options, builtin_remote_usage, 0);
argc = parse_options(argc, argv, NULL, options, builtin_remote_usage,
0);
if (argc < 1)
return show_all();
@ -1076,7 +1078,8 @@ static int set_head(int argc, const char **argv)
"delete refs/remotes/<name>/HEAD"),
OPT_END()
};
argc = parse_options(argc, argv, options, builtin_remote_usage, 0);
argc = parse_options(argc, argv, NULL, options, builtin_remote_usage,
0);
if (argc)
strbuf_addf(&buf, "refs/remotes/%s/HEAD", argv[0]);
@ -1130,7 +1133,8 @@ static int prune(int argc, const char **argv)
OPT_END()
};
argc = parse_options(argc, argv, options, builtin_remote_usage, 0);
argc = parse_options(argc, argv, NULL, options, builtin_remote_usage,
0);
if (argc < 1)
usage_with_options(builtin_remote_usage, options);
@ -1220,7 +1224,7 @@ static int update(int argc, const char **argv)
OPT_END()
};
argc = parse_options(argc, argv, options, builtin_remote_usage,
argc = parse_options(argc, argv, NULL, options, builtin_remote_usage,
PARSE_OPT_KEEP_ARGV0);
if (argc < 2) {
argc = 2;
@ -1306,7 +1310,7 @@ int cmd_remote(int argc, const char **argv, const char *prefix)
};
int result;
argc = parse_options(argc, argv, options, builtin_remote_usage,
argc = parse_options(argc, argv, prefix, options, builtin_remote_usage,
PARSE_OPT_STOP_AT_NON_OPTION);
if (argc < 1)