diff options
| author | Alex Henrie <alexhenrie24@gmail.com> | 2021-07-21 01:42:19 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-20 21:43:12 -0700 |
| commit | 3d5fc24daefbdf56bc36a491aed0b7990fa0c62f (patch) | |
| tree | ef359b69c3e219588b10455b6fe7d89976df9f93 /builtin/merge.c | |
| parent | 1d25e5bdf5263a227d233eafcf028b36c72716f6 (diff) | |
pull: abort if --ff-only is given and fast-forwarding is impossible
The warning about pulling without specifying how to reconcile divergent
branches says that after setting pull.rebase to true, --ff-only can
still be passed on the command line to require a fast-forward. Make that
actually work.
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
[en: updated tests; note 3 fixes and 1 new failure]
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index a8a843b1f5..aa920ac524 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1620,7 +1620,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) } if (fast_forward == FF_ONLY) - die(_("Not possible to fast-forward, aborting.")); + die_ff_impossible(); if (autostash) create_autostash(the_repository, |