diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-12 21:49:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-12 21:49:53 -0800 |
| commit | 6e67619d0cdc175557ca633dec391d4e795cf965 (patch) | |
| tree | 4bf38f387e838a3ce2c08ab55e1f617c7d501f20 /builtin/blame.c | |
| parent | 47bfb3d946288ec359bf98d06cc668a2ba12f3cb (diff) | |
| parent | 309be813c9b75fed70f3a03bf803bf47c6670cfc (diff) | |
| download | git-6e67619d0cdc175557ca633dec391d4e795cf965.tar.gz | |
Merge branch 'jn/parse-options-extra'
* jn/parse-options-extra:
update-index: migrate to parse-options API
setup: save prefix (original cwd relative to toplevel) in startup_info
parse-options: make resuming easier after PARSE_OPT_STOP_AT_NON_OPTION
parse-options: allow git commands to invent new option types
parse-options: never suppress arghelp if LITERAL_ARGHELP is set
parse-options: do not infer PARSE_OPT_NOARG from option type
parse-options: sanity check PARSE_OPT_NOARG flag
parse-options: move NODASH sanity checks to parse_options_check
parse-options: clearer reporting of API misuse
parse-options: Don't call parse_options_check() so much
Diffstat (limited to 'builtin/blame.c')
| -rw-r--r-- | builtin/blame.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index cb25ec9ce8..aa30ec5269 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -2325,8 +2325,8 @@ int cmd_blame(int argc, const char **argv, const char *prefix) save_commit_buffer = 0; dashdash_pos = 0; - parse_options_start(&ctx, argc, argv, prefix, PARSE_OPT_KEEP_DASHDASH | - PARSE_OPT_KEEP_ARGV0); + parse_options_start(&ctx, argc, argv, prefix, options, + PARSE_OPT_KEEP_DASHDASH | PARSE_OPT_KEEP_ARGV0); for (;;) { switch (parse_options_step(&ctx, options, blame_opt_usage)) { case PARSE_OPT_HELP: |