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 <j...@szakmeister.net>
---
scripts/feeds | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
This is mainly about working around user preferences to some degree, but I think
it's the right thing to do.
-John
diff --git a/scripts/feeds b/scripts/feeds
index 383a0d8..680500d 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' => {
--
1.8.3.1
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
