From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 2 Sep 2013 18:25:10 +0000 (+0000)
Subject: scripts/feeds: ensure that --ff is enabled
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a1267290ed9332b0de65f97ab3222e747b7634d6;p=openwrt%2Fstaging%2Fnbd.git

scripts/feeds: ensure that --ff is enabled

Users may have merge.ff set to false, which will force merge commits to
be generated.  The intent here is to have a fast-forward merge when
possible, so let's make sure fast-forwards are enabled.

Signed-off-by: John Szakmeister <john@szakmeister.net>
Signed-off-by: Florian Fainelli <florian@openwrt.org>

SVN-Revision: 37884
---

diff --git a/scripts/feeds b/scripts/feeds
index 383a0d80d9..680500d418 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -119,7 +119,7 @@ my %update_method = (
 	'src-git' => {
 		'init'          => "git clone --depth 1 '%s' '%s'",
 		'init_branch'   => "git clone --depth 1 --branch '%s' '%s' '%s'",
-		'update'	=> "git pull",
+		'update'	=> "git pull --ff",
 		'controldir'	=> ".git",
 		'revision'	=> "git show --abbrev-commit HEAD | head -n 1 | cut -d ' ' -f 2 | tr -d '\n'"},
 	'src-gitsvn' => {