diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-01 03:57:42 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-01 03:57:42 +0400 |
| commit | f9275c68af58e0f65e1557b5109ccbfdbbbc384a (patch) | |
| tree | 7479d66d97277f47490de10e204cfcbc0a123885 /builtin-cat-file.c | |
| parent | 714cdcd03e2caac6e2dc8d94debc7c800742f546 (diff) | |
| parent | df217ed6430efe444a09fffdafd39720ae3f9864 (diff) | |
Merge branch 'sb/opt-filename'
* sb/opt-filename:
parse-opts: add OPT_FILENAME and transition builtins
parse-opts: prepare for OPT_FILENAME
Conflicts:
builtin-log.c
Diffstat (limited to 'builtin-cat-file.c')
| -rw-r--r-- | builtin-cat-file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-cat-file.c b/builtin-cat-file.c index 43ffe7ffae..5906842008 100644 --- a/builtin-cat-file.c +++ b/builtin-cat-file.c @@ -231,7 +231,7 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix) if (argc != 3 && argc != 2) usage_with_options(cat_file_usage, options); - argc = parse_options(argc, argv, options, cat_file_usage, 0); + argc = parse_options(argc, argv, prefix, options, cat_file_usage, 0); if (opt) { if (argc == 1) |