summaryrefslogtreecommitdiff
path: root/builtin-apply.c
diff options
context:
space:
mode:
authorStephen Boyd <bebarino@gmail.com>2009-05-23 18:53:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-05-25 08:07:33 (GMT)
commitdf217ed6430efe444a09fffdafd39720ae3f9864 (patch)
treedc87087a7cff7332fb9de36c7d3cad6e37b5df9c /builtin-apply.c
parent377829201783b8a648e07af6ce7d747e0f45dc19 (diff)
downloadgit-df217ed6430efe444a09fffdafd39720ae3f9864.zip
git-df217ed6430efe444a09fffdafd39720ae3f9864.tar.gz
git-df217ed6430efe444a09fffdafd39720ae3f9864.tar.bz2
parse-opts: add OPT_FILENAME and transition builtins
Commit dbd0f5c (Files given on the command line are relative to $cwd, 2008-08-06) introduced parse_options_fix_filename() as a minimal fix. OPT_FILENAME is intended to be a more robust fix for the same issue. OPT_FILENAME and its associated enum OPTION_FILENAME are used to represent filename options within the parse options API. This option is similar to OPTION_STRING. If --no is prefixed to the option the filename is unset. If no argument is given and the default value is set, the filename is set to the default value. The difference is that the filename is prefixed with the prefix passed to parse_options() (or parse_options_start()). Update git-apply, git-commit, git-fmt-merge-msg, and git-tag to use OPT_FILENAME with their filename options. Also, rename parse_options_fix_filename() to fix_filename() as it is no longer extern. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-apply.c')
-rw-r--r--builtin-apply.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/builtin-apply.c b/builtin-apply.c
index bac03d7..5329186 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -3278,7 +3278,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",
@@ -3315,9 +3315,6 @@ int cmd_apply(int argc, const char **argv, const char *unused_prefix)
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;