diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-06-01 06:06:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-01 06:06:38 (GMT) |
| commit | e1149fd7d95e3b63f56d4360e135428fc3f7eb82 (patch) | |
| tree | 21a585696e84b23bdc087ae87e85278c1f22b754 /builtin/difftool.c | |
| parent | 2bd108ff65031b79d191cfa491fa676ca67e7788 (diff) | |
| parent | 3e4a67b47d020c8c61d8a762d1903f5288e94778 (diff) | |
| download | git-e1149fd7d95e3b63f56d4360e135428fc3f7eb82.zip git-e1149fd7d95e3b63f56d4360e135428fc3f7eb82.tar.gz git-e1149fd7d95e3b63f56d4360e135428fc3f7eb82.tar.bz2 | |
Merge branch 'nd/use-opt-int-set-f'
Code simplification.
* nd/use-opt-int-set-f:
Use OPT_SET_INT_F() for cmdline option specification
Diffstat (limited to 'builtin/difftool.c')
| -rw-r--r-- | builtin/difftool.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/builtin/difftool.c b/builtin/difftool.c index 162806f..bc97d4a 100644 --- a/builtin/difftool.c +++ b/builtin/difftool.c @@ -695,12 +695,11 @@ int cmd_difftool(int argc, const char **argv, const char *prefix) N_("use `diff.guitool` instead of `diff.tool`")), OPT_BOOL('d', "dir-diff", &dir_diff, N_("perform a full-directory diff")), - { OPTION_SET_INT, 'y', "no-prompt", &prompt, NULL, + OPT_SET_INT_F('y', "no-prompt", &prompt, N_("do not prompt before launching a diff tool"), - PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 0}, - { OPTION_SET_INT, 0, "prompt", &prompt, NULL, NULL, - PARSE_OPT_NOARG | PARSE_OPT_NONEG | PARSE_OPT_HIDDEN, - NULL, 1 }, + 0, PARSE_OPT_NONEG), + OPT_SET_INT_F(0, "prompt", &prompt, NULL, + 1, PARSE_OPT_NONEG | PARSE_OPT_HIDDEN), OPT_BOOL(0, "symlinks", &symlinks, N_("use symlinks in dir-diff mode")), OPT_STRING('t', "tool", &difftool_cmd, N_("<tool>"), |