# [PATCH 1/2] parse-opt: make PARSE_OPT_STOP_AT_NON_OPTION available to git rev-parse 5 messages from 2009-04-28 to 2009-06-07. Participants: Uwe Kleine-König, Jeff King. Thread: https://gitlist.dev/t/19112 ## Uwe Kleine-König, 2009-04-28 20:29 Subject: [PATCH 1/2] parse-opt: make PARSE_OPT_STOP_AT_NON_OPTION available to git rev-parse Message-ID: <1240950564-15124-1-git-send-email-u.kleine-koenig@pengutronix.de> URL: https://gitlist.dev/e/1240950564-15124-1-git-send-email-u.kleine-koenig%40pengutronix.de ``` Signed-off-by: Uwe Kleine-König --- Documentation/git-rev-parse.txt | 5 +++++ builtin-rev-parse.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt index fba30b1..8d3ba14 100644 --- a/Documentation/git-rev-parse.txt +++ b/Documentation/git-rev-parse.txt @@ -30,6 +30,11 @@ OPTIONS Only meaningful in `--parseopt` mode. Tells the option parser to echo out the first `--` met instead of skipping it. +--stop-at-non-option:: + Only meaningful in `--parseopt` mode. Lets the option parser stop at + the first non-option argument. This can be used to parse sub-commands + that take options themself. + --revs-only:: Do not output flags and parameters not meant for 'git-rev-list' command. diff --git a/builtin-rev-parse.c b/builtin-rev-parse.c index 22c6d6a..864f13d 100644 --- a/builtin-rev-parse.c +++ b/builtin-rev-parse.c @@ -301,7 +301,7 @@ static const char *skipspaces(const char *s) static int cmd_parseopt(int argc, const char **argv, const char *prefix) { - static int keep_dashdash = 0; + static int keep_dashdash = 0, stop_at_non_option = 0; static char const * const parseopt_usage[] = { "git rev-parse --parseopt [options] -- [...]", NULL @@ -309,6 +309,9 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix) static struct option parseopt_opts[] = { OPT_BOOLEAN(0, "keep-dashdash", &keep_dashdash, "keep the `--` passed as an arg"), + OPT_BOOLEAN(0, "stop-at-non-option", &stop_at_non_option, + "stop parsing after the " + "first non-option argument"), OPT_END(), }; @@ -394,7 +397,8 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix) ALLOC_GROW(opts, onb + 1, osz); memset(opts + onb, 0, sizeof(opts[onb])); argc = parse_options(argc, argv, opts, usage, - keep_dashdash ? PARSE_OPT_KEEP_DASHDASH : 0); + keep_dashdash ? PARSE_OPT_KEEP_DASHDASH : 0 | + stop_at_non_option ? PARSE_OPT_STOP_AT_NON_OPTION : 0); strbuf_addf(&parsed, " --"); sq_quote_argv(&parsed, argv, 0); -- 1.6.2.4 ``` ## Uwe Kleine-König, 2009-04-28 20:29 Subject: [PATCH 2/2] parseopt: fix documentation for --keep-dashdash Message-ID: <1240950564-15124-2-git-send-email-u.kleine-koenig@pengutronix.de> URL: https://gitlist.dev/e/1240950564-15124-2-git-send-email-u.kleine-koenig%40pengutronix.de In-Reply-To: <1240950564-15124-1-git-send-email-u.kleine-koenig@pengutronix.de> ``` Signed-off-by: Uwe Kleine-König --- Documentation/git-rev-parse.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt index 8d3ba14..0e4746f 100644 --- a/Documentation/git-rev-parse.txt +++ b/Documentation/git-rev-parse.txt @@ -26,7 +26,7 @@ OPTIONS --parseopt:: Use 'git-rev-parse' in option parsing mode (see PARSEOPT section below). ---keep-dash-dash:: +--keep-dashdash:: Only meaningful in `--parseopt` mode. Tells the option parser to echo out the first `--` met instead of skipping it. -- 1.6.2.4 ``` ## Jeff King, 2009-04-29 04:08 Subject: Re: [PATCH 1/2] parse-opt: make PARSE_OPT_STOP_AT_NON_OPTION available to git rev-parse Message-ID: <20090429040804.GB14912@coredump.intra.peff.net> URL: https://gitlist.dev/e/20090429040804.GB14912%40coredump.intra.peff.net In-Reply-To: <1240950564-15124-1-git-send-email-u.kleine-koenig@pengutronix.de> ``` On Tue, Apr 28, 2009 at 10:29:23PM +0200, Uwe Kleine-König wrote: > Signed-off-by: Uwe Kleine-König > --- > Documentation/git-rev-parse.txt | 5 +++++ > builtin-rev-parse.c | 8 ++++++-- > 2 files changed, 11 insertions(+), 2 deletions(-) I expected there to be a shell caller here or in patch 2/2, but there isn't. Is this for topgit? -Peff ``` ## Uwe Kleine-König, 2009-04-29 08:10 Subject: Re: [PATCH 1/2] parse-opt: make PARSE_OPT_STOP_AT_NON_OPTION available to git rev-parse Message-ID: <20090429081022.GA18521@pengutronix.de> URL: https://gitlist.dev/e/20090429081022.GA18521%40pengutronix.de In-Reply-To: <20090429040804.GB14912@coredump.intra.peff.net> ``` Hi Jeff, On Wed, Apr 29, 2009 at 12:08:04AM -0400, Jeff King wrote: > On Tue, Apr 28, 2009 at 10:29:23PM +0200, Uwe Kleine-König wrote: > > > Signed-off-by: Uwe Kleine-König > > --- > > Documentation/git-rev-parse.txt | 5 +++++ > > builtin-rev-parse.c | 8 ++++++-- > > 2 files changed, 11 insertions(+), 2 deletions(-) > > I expected there to be a shell caller here or in patch 2/2, but there > isn't. Is this for topgit? Yes, I had topgit in mind when adding that option. Assuming it will make it into git.git, I won't use it for some time though to not depend on bleeding edge for topgit, though. It wasn't intentionally that I sent the two patches in a series. Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | http://www.pengutronix.de/ | ``` ## Uwe Kleine-König, 2009-06-07 18:19 Subject: [RESEND PATCH] parse-opt: make PARSE_OPT_STOP_AT_NON_OPTION available to git rev-parse Message-ID: <1244398788-6777-1-git-send-email-u.kleine-koenig@pengutronix.de> URL: https://gitlist.dev/e/1244398788-6777-1-git-send-email-u.kleine-koenig%40pengutronix.de In-Reply-To: <1240950564-15124-1-git-send-email-u.kleine-koenig@pengutronix.de> ``` Signed-off-by: Uwe Kleine-König --- Hello, there is no caller for --stop-at-non-option in git-core itself. This is mainly targeted for topgit and its successor I currently code up. Since the last post I only updated it because the old patch resulted in two merge conflicts (git-rev-parse learned "--sq-quote" and parse_options got a new argument "prefix") Documentation/git-rev-parse.txt | 5 +++++ builtin-rev-parse.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt index 4bbdd05..82045a2 100644 --- a/Documentation/git-rev-parse.txt +++ b/Documentation/git-rev-parse.txt @@ -30,6 +30,11 @@ OPTIONS Only meaningful in `--parseopt` mode. Tells the option parser to echo out the first `--` met instead of skipping it. +--stop-at-non-option:: + Only meaningful in `--parseopt` mode. Lets the option parser stop at + the first non-option argument. This can be used to parse sub-commands + that take options themself. + --sq-quote:: Use 'git-rev-parse' in shell quoting mode (see SQ-QUOTE section below). In contrast to the `--sq` option below, this diff --git a/builtin-rev-parse.c b/builtin-rev-parse.c index 112d622..5ea7518 100644 --- a/builtin-rev-parse.c +++ b/builtin-rev-parse.c @@ -301,7 +301,7 @@ static const char *skipspaces(const char *s) static int cmd_parseopt(int argc, const char **argv, const char *prefix) { - static int keep_dashdash = 0; + static int keep_dashdash = 0, stop_at_non_option = 0; static char const * const parseopt_usage[] = { "git rev-parse --parseopt [options] -- [...]", NULL @@ -309,6 +309,9 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix) static struct option parseopt_opts[] = { OPT_BOOLEAN(0, "keep-dashdash", &keep_dashdash, "keep the `--` passed as an arg"), + OPT_BOOLEAN(0, "stop-at-non-option", &stop_at_non_option, + "stop parsing after the " + "first non-option argument"), OPT_END(), }; @@ -394,7 +397,8 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix) ALLOC_GROW(opts, onb + 1, osz); memset(opts + onb, 0, sizeof(opts[onb])); argc = parse_options(argc, argv, prefix, opts, usage, - keep_dashdash ? PARSE_OPT_KEEP_DASHDASH : 0); + keep_dashdash ? PARSE_OPT_KEEP_DASHDASH : 0 | + stop_at_non_option ? PARSE_OPT_STOP_AT_NON_OPTION : 0); strbuf_addf(&parsed, " --"); sq_quote_argv(&parsed, argv, 0); -- 1.6.3.1 ```