diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-21 06:02:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-21 06:02:45 -0700 |
| commit | 632d3f4b5b80700c6c7c3637d6a4d1d9a457f7e1 (patch) | |
| tree | bdf796bb5b9c6bbafaaaa9b9ba8b3b50e9c83bc7 /builtin | |
| parent | 762655010d6f051f632a77b8c5b95b9f5cad02c9 (diff) | |
| parent | 47e9cd28f8a404a0d6293935252ddca5fc243931 (diff) | |
| download | git-632d3f4b5b80700c6c7c3637d6a4d1d9a457f7e1.tar.gz git-632d3f4b5b80700c6c7c3637d6a4d1d9a457f7e1.tar.xz | |
Merge branch 'gs/usage-to-stdout'
* gs/usage-to-stdout:
parseopt: wrap rev-parse --parseopt usage for eval consumption
print the usage string on stdout instead of stderr
Conflicts:
parse-options.h
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/rev-parse.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c index 8fbf9d0db..b676e2963 100644 --- a/builtin/rev-parse.c +++ b/builtin/rev-parse.c @@ -408,7 +408,8 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix) memset(opts + onb, 0, sizeof(opts[onb])); argc = parse_options(argc, argv, prefix, opts, usage, keep_dashdash ? PARSE_OPT_KEEP_DASHDASH : 0 | - stop_at_non_option ? PARSE_OPT_STOP_AT_NON_OPTION : 0); + stop_at_non_option ? PARSE_OPT_STOP_AT_NON_OPTION : 0 | + PARSE_OPT_SHELL_EVAL); strbuf_addf(&parsed, " --"); sq_quote_argv(&parsed, argv, 0); |