summaryrefslogtreecommitdiff
path: root/builtin-apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-05-31 23:57:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-05-31 23:57:42 (GMT)
commitf9275c68af58e0f65e1557b5109ccbfdbbbc384a (patch)
tree7479d66d97277f47490de10e204cfcbc0a123885 /builtin-apply.c
parent714cdcd03e2caac6e2dc8d94debc7c800742f546 (diff)
parentdf217ed6430efe444a09fffdafd39720ae3f9864 (diff)
downloadgit-f9275c68af58e0f65e1557b5109ccbfdbbbc384a.zip
git-f9275c68af58e0f65e1557b5109ccbfdbbbc384a.tar.gz
git-f9275c68af58e0f65e1557b5109ccbfdbbbc384a.tar.bz2
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-apply.c')
-rw-r--r--builtin-apply.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/builtin-apply.c b/builtin-apply.c
index ebbf084..94ba2bd 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -3292,7 +3292,7 @@ int cmd_apply(int argc, const char **argv, const char *unused_prefix)
"apply a patch without touching the working tree"),
OPT_BOOLEAN(0, "apply", &force_apply,
"also apply the patch (use with --stat/--summary/--check)"),
- OPT_STRING(0, "build-fake-ancestor", &fake_ancestor, "file",
+ OPT_FILENAME(0, "build-fake-ancestor", &fake_ancestor,
"build a temporary index based on embedded index information"),
{ OPTION_CALLBACK, 'z', NULL, NULL, NULL,
"paths are separated with NUL character",
@@ -3327,11 +3327,8 @@ int cmd_apply(int argc, const char **argv, const char *unused_prefix)
if (apply_default_whitespace)
parse_whitespace_option(apply_default_whitespace);
- argc = parse_options(argc, argv, builtin_apply_options,
+ argc = parse_options(argc, argv, prefix, builtin_apply_options,
apply_usage, 0);
- fake_ancestor = parse_options_fix_filename(prefix, fake_ancestor);
- if (fake_ancestor)
- fake_ancestor = xstrdup(fake_ancestor);
if (apply_with_reject)
apply = apply_verbosely = 1;