diff options
author | Stephen Boyd <bebarino@gmail.com> | 2009-05-23 11:53:12 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-05-25 01:07:25 -0700 |
commit | 377829201783b8a648e07af6ce7d747e0f45dc19 (patch) | |
tree | fe989294bc3d3c8adb2c6d6b8fb7702be7c23acf /builtin-show-branch.c | |
parent | Merge branch 'jc/mktree' into sb/opt-filename (diff) | |
download | tgif-377829201783b8a648e07af6ce7d747e0f45dc19.tar.xz |
parse-opts: prepare for OPT_FILENAME
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>
Diffstat (limited to 'builtin-show-branch.c')
-rw-r--r-- | builtin-show-branch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-show-branch.c b/builtin-show-branch.c index b1affd2ffb..9433811956 100644 --- a/builtin-show-branch.c +++ b/builtin-show-branch.c @@ -697,7 +697,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) av = default_arg - 1; /* ick; we would not address av[0] */ } - ac = parse_options(ac, av, builtin_show_branch_options, + ac = parse_options(ac, av, prefix, builtin_show_branch_options, show_branch_usage, PARSE_OPT_STOP_AT_NON_OPTION); if (all_heads) all_remotes = 1; |