[oe-commits] Markus Lehtonen : combo-layer: only allow fast-forward when pulling

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 5207169b9c6c4b05c6b043745905a5498adca1a3
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=5207169b9c6c4b05c6b043745905a5498adca1a3

Author: Markus Lehtonen <markus.lehtonen at linux.intel.com>
Date:   Wed Jul  8 13:59:48 2015 +0300

combo-layer: only allow fast-forward when pulling

Only allow fast-forward merges in the component repositories when doing
git-pull. This makes it possible to spot problems (i.e. rewriting of
history) in the component upstream . Also, this change prevents the
creation of local-only merge commits in the component repositories.
These merges cause "last_revision" field of the combo-layer config to
point to a git commit that is only present in the users local component
repository but nowhere in upstream.

Signed-off-by: Markus Lehtonen <markus.lehtonen at linux.intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 scripts/combo-layer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/combo-layer b/scripts/combo-layer
index 2d100be..8637add 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -587,7 +587,7 @@ def action_pull(conf, args):
         branch = repo.get('branch', "master")
         runcmd("git checkout %s" % branch, ldir)
         logger.info("git pull for component repo %s in %s ..." % (name, ldir))
-        output=runcmd("git pull", ldir)
+        output=runcmd("git pull --ff-only", ldir)
         logger.info(output)
 
 def action_update(conf, args):