[0/6] pull: improve default warning

Message

Felipe Contreras Nov. 24, 2020, 1:30 p.m. UTC

This patch series attempts to silence a bit more the default pull warning (when no pull.rebase is
configured, or pull.ff).

Basically; display the warning only when a fast-forward merge is not possible.

More work is needed to add a ff-only option.


Felipe Contreras (6):
  pull: refactor fast-forward check
  pull: cleanup autostash check
  pull: trivial cleanup
  pull: move default warning
  pull: display default warning only when non-ff
  test: pull-options: revert unnecessary changes

 builtin/pull.c               | 79 ++++++++++++++++++++----------------
 t/t5521-pull-options.sh      | 22 +++++-----
 t/t7601-merge-pull-config.sh |  8 +++-
 3 files changed, 61 insertions(+), 48 deletions(-)