Merge branch 'maint'

diff --git a/builtin-cat-file.c b/builtin-cat-file.c
index 43ffe7ffae90322d757e110d8693a936209236f0..590684200854ad6a71653f30d494eb191fd4a324 100644 (file)
--- 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)