Merge branch 'jc/maint-merge-recursive-fix' into maint

diff --git a/builtin-mktree.c b/builtin-mktree.c
index dc4f1a711df0e84657c9f1ea3edcba20c9764e75..098395fda1932674e29f8d2cb332c722a6cb275f 100644 (file)
--- a/builtin-mktree.c
+++ b/builtin-mktree.c
@@ -155,7 +155,7 @@ int cmd_mktree(int ac, const char **av, const char *prefix)
                OPT_END()
        };
 
-       ac = parse_options(ac, av, option, mktree_usage, 0);
+       ac = parse_options(ac, av, prefix, option, mktree_usage, 0);
 
        while (!got_eof) {
                while (1) {