diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-06-01 15:06:38 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-01 15:06:38 +0900 |
| commit | e1149fd7d95e3b63f56d4360e135428fc3f7eb82 (patch) | |
| tree | 21a585696e84b23bdc087ae87e85278c1f22b754 /builtin/merge.c | |
| parent | 2bd108ff65031b79d191cfa491fa676ca67e7788 (diff) | |
| parent | 3e4a67b47d020c8c61d8a762d1903f5288e94778 (diff) | |
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/merge.c')
| -rw-r--r-- | builtin/merge.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 6d7bbe8c9f..b00d6f4821 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -215,9 +215,9 @@ static struct option builtin_merge_options[] = { OPT_BOOL('e', "edit", &option_edit, N_("edit message before committing")), OPT_SET_INT(0, "ff", &fast_forward, N_("allow fast-forward (default)"), FF_ALLOW), - { OPTION_SET_INT, 0, "ff-only", &fast_forward, NULL, - N_("abort if fast-forward is not possible"), - PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, FF_ONLY }, + OPT_SET_INT_F(0, "ff-only", &fast_forward, + N_("abort if fast-forward is not possible"), + FF_ONLY, PARSE_OPT_NONEG), OPT_RERERE_AUTOUPDATE(&allow_rerere_auto), OPT_BOOL(0, "verify-signatures", &verify_signatures, N_("verify that the named commit has a valid GPG signature")), |