summaryrefslogtreecommitdiff
path: root/builtin-mktree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-05-31 16:57:42 -0700
committerJunio C Hamano <gitster@pobox.com>2009-05-31 16:57:42 -0700
commitf9275c68af58e0f65e1557b5109ccbfdbbbc384a (patch)
tree7479d66d97277f47490de10e204cfcbc0a123885 /builtin-mktree.c
parent714cdcd03e2caac6e2dc8d94debc7c800742f546 (diff)
parentdf217ed6430efe444a09fffdafd39720ae3f9864 (diff)
downloadgit-f9275c68af58e0f65e1557b5109ccbfdbbbc384a.tar.gz
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-mktree.c')
-rw-r--r--builtin-mktree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-mktree.c b/builtin-mktree.c
index dc4f1a711d..098395fda1 100644
--- 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) {