| commit | c525de335e4a3919d49a9126b76d1288f35737be | |
| author | Felipe Contreras <felipe.contreras@gmail.com> | |
| Sat, 12 Dec 2020 16:52:08 +0000 (12 10:52 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 16 Dec 2020 01:39:42 +0000 (15 17:39 -0800) | ||
| tree | 7f27847036306c8ac80325a37680ce64219b54fd | treesnapshot (tar.gz zip) |
| parent | 7539fdc6290750c617c0b638c2f3b2f63c389ed3 | commitdiff |
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 <gitster@pobox.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 <gitster@pobox.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/pull.c | diffblobblamehistory | |
| t/t7601-merge-pull-config.sh | diffblobblamehistory |