git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7539fdc)
pull: display default warning only when non-ff
authorFelipe Contreras <redacted>
Sat, 12 Dec 2020 16:52:08 +0000 (10:52 -0600)
committerJunio C Hamano <redacted>
Wed, 16 Dec 2020 01:39:42 +0000 (17:39 -0800)
commitc525de335e4a3919d49a9126b76d1288f35737be
tree7f27847036306c8ac80325a37680ce64219b54fdtree | snapshot
parent7539fdc6290750c617c0b638c2f3b2f63c389ed3commit | diff
pull: display default warning only when non-ff

There's no need to display the annoying warning on every pull... only
the ones that are not fast-forward.

The current warning tests still pass, but not because of the arguments
or the configuration, but because they are all fast-forward.

We need to test non-fast-forward situations now.

Suggestions-by: Junio C Hamano <redacted>
Signed-off-by: Felipe Contreras <redacted>
Signed-off-by: Junio C Hamano <redacted>
builtin/pull.c diff | blob | history
t/t7601-merge-pull-config.sh diff | blob | history
git clone https://git.99rst.org/PROJECT