From: Hannu Nyman <hannu.nyman@iki.fi>
Date: Sat, 14 Nov 2020 09:33:00 +0000 (+0200)
Subject: scripts/feeds: silence git warning by selecting pull style
X-Git-Tag: v21.02.0-rc1~969
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2b1d92f;p=openwrt%2Fstaging%2Fhauke.git

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@iki.fi>
---

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'"},