diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-02-09 18:01:42 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-02-09 10:24:50 -0800 |
| commit | 1224781d6080b8b69a81526ee23b22a1587920ea (patch) | |
| tree | 8b31c3cc26307351710d01d6b797d77101bb97b8 /builtin/pull.c | |
| parent | parse-options: add OPT_xxx_F() variants (diff) | |
| download | tgif-1224781d6080b8b69a81526ee23b22a1587920ea.tar.xz | |
parse-options: let OPT__FORCE take optional flags argument
--force option is most likely hidden from command line completion for
safety reasons. This is done by adding an extra flag
PARSE_OPT_NOCOMPLETE. Update OPT__FORCE() to accept additional
flags. Actual flag change comes later depending on individual
commands.
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 'builtin/pull.c')
| -rw-r--r-- | builtin/pull.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index 511dbbe0f6..652239aae9 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -193,7 +193,7 @@ static struct option pull_options[] = { OPT_PASSTHRU(0, "upload-pack", &opt_upload_pack, N_("path"), N_("path to upload pack on remote end"), 0), - OPT__FORCE(&opt_force, N_("force overwrite of local branch")), + OPT__FORCE(&opt_force, N_("force overwrite of local branch"), 0), OPT_PASSTHRU('t', "tags", &opt_tags, NULL, N_("fetch all tags and associated objects"), PARSE_OPT_NOARG), |