[openwrt/openwrt] scripts/feeds: silence git warning by selecting pull style

[LEDE Commits]

aparcar pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/2b1d92f134e9b6c5744a3cc2d0e22273a7a5fe03

commit 2b1d92f134e9b6c5744a3cc2d0e22273a7a5fe03
Author: Hannu Nyman <hannu.nyman at iki.fi>
AuthorDate: Sat Nov 14 11:33:00 2020 +0200

    scripts/feeds: silence git warning by selecting pull style
    
    Silence the warning in git 2.27 about undefined fast-forward style
    in git pull. Define "ff-only" as the style.
    
    Signed-off-by: Hannu Nyman <hannu.nyman at iki.fi>
---
 scripts/feeds | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/feeds b/scripts/feeds
index 69ab60278a..22d4f8e8f4 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -158,8 +158,8 @@ my %update_method = (
 		'init'          => "git clone --depth 1 '%s' '%s'",
 		'init_branch'   => "git clone --depth 1 --branch '%s' '%s' '%s'",
 		'init_commit'   => "git clone '%s' '%s' && cd '%s' && git checkout -b '%s' '%s' && cd -",
-		'update'	=> "git pull --ff",
-		'update_force'	=> "git pull --ff || (git reset --hard HEAD; git pull --ff; exit 1)",
+		'update'	=> "git pull --ff-only",
+		'update_force'	=> "git pull --ff-only || (git reset --hard HEAD; git pull --ff-only; exit 1)",
 		'post_update'	=> "git submodule update --init --recursive",
 		'controldir'	=> ".git",
 		'revision'	=> "git rev-parse --short HEAD | tr -d '\n'"},