summaryrefslogtreecommitdiff
path: root/apply.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-02-09 11:01:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-02-09 18:24:50 (GMT)
commitb8e9d6629426d2e955ffbf038a4386f5e0242be7 (patch)
tree887d8142fd73f8abbf3d4efdd9d325272ffe5a25 /apply.c
parentbe3ce6b2505467d445c671feeb76e7ad1c40aee7 (diff)
downloadgit-b8e9d6629426d2e955ffbf038a4386f5e0242be7.zip
git-b8e9d6629426d2e955ffbf038a4386f5e0242be7.tar.gz
git-b8e9d6629426d2e955ffbf038a4386f5e0242be7.tar.bz2
completion: use __gitcomp_builtin in _git_apply
The new completable options are: --3way --allow-overlap --build-fake-ancestor= --directory --exclude --include --index-info is no longer completable but that's because it's renamed to --build-fake-ancestor in 26b2800768 (apply: get rid of --index-info in favor of --build-fake-ancestor - 2007-09-17) Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'apply.c')
-rw-r--r--apply.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/apply.c b/apply.c
index 321a9fa..65eb37e 100644
--- a/apply.c
+++ b/apply.c
@@ -4943,8 +4943,9 @@ int apply_parse_options(int argc, const char **argv,
N_("make sure the patch is applicable to the current index")),
OPT_BOOL(0, "cached", &state->cached,
N_("apply a patch without touching the working tree")),
- OPT_BOOL(0, "unsafe-paths", &state->unsafe_paths,
- N_("accept a patch that touches outside the working area")),
+ OPT_BOOL_F(0, "unsafe-paths", &state->unsafe_paths,
+ N_("accept a patch that touches outside the working area"),
+ PARSE_OPT_NOCOMPLETE),
OPT_BOOL(0, "apply", force_apply,
N_("also apply the patch (use with --stat/--summary/--check)")),
OPT_BOOL('3', "3way", &state->threeway,