summaryrefslogtreecommitdiff
path: root/builtin-revert.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-revert.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-revert.c')
-rw-r--r--builtin-revert.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-revert.c b/builtin-revert.c
index ae0139500a..c87115af30 100644
--- a/builtin-revert.c
+++ b/builtin-revert.c
@@ -60,7 +60,7 @@ static void parse_args(int argc, const char **argv)
OPT_END(),
};
- if (parse_options(argc, argv, options, usage_str, 0) != 1)
+ if (parse_options(argc, argv, NULL, options, usage_str, 0) != 1)
usage_with_options(usage_str, options);
arg = argv[0];