Merge branch 'bc/solaris'

diff --git a/builtin-branch.c b/builtin-branch.c
index 6aaa708473231848db8cba061f6048d41a6782af..5687d6042ced29e60aa1999dc9d73eb6c38b8e77 100644 (file)
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -610,7 +610,8 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
        }
        hashcpy(merge_filter_ref, head_sha1);
 
-       argc = parse_options(argc, argv, options, builtin_branch_usage, 0);
+       argc = parse_options(argc, argv, prefix, options, builtin_branch_usage,
+                            0);
        if (!!delete + !!rename + !!force_create > 1)
                usage_with_options(builtin_branch_usage, options);