diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2013-10-31 03:25:32 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-31 11:12:24 -0700 |
| commit | 90f867b9a5088a2ea6f5844ae28b617821e77b28 (patch) | |
| tree | 09432e03d159e917d3e3eb3a0b72c08ff59a5be4 /builtin/merge.c | |
| parent | 42817b96b1b80b56fd5a4d5e0d6239524b1832a3 (diff) | |
| download | git-90f867b9a5088a2ea6f5844ae28b617821e77b28.tar.gz git-90f867b9a5088a2ea6f5844ae28b617821e77b28.tar.xz | |
merge: simplify ff-only option
No functional changes.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 02a69c14e..41fb66dec 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -186,13 +186,6 @@ static int option_parse_n(const struct option *opt, return 0; } -static int option_parse_ff_only(const struct option *opt, - const char *arg, int unset) -{ - fast_forward = FF_ONLY; - return 0; -} - static struct option builtin_merge_options[] = { { OPTION_CALLBACK, 'n', NULL, NULL, NULL, N_("do not show a diffstat at the end of the merge"), @@ -210,9 +203,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_CALLBACK, 0, "ff-only", NULL, NULL, + { OPTION_SET_INT, 0, "ff-only", &fast_forward, NULL, N_("abort if fast-forward is not possible"), - PARSE_OPT_NOARG | PARSE_OPT_NONEG, option_parse_ff_only }, + PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, FF_ONLY }, OPT_RERERE_AUTOUPDATE(&allow_rerere_auto), OPT_BOOL(0, "verify-signatures", &verify_signatures, N_("Verify that the named commit has a valid GPG signature")), |