summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2015-07-08 13:59:48 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-16 15:09:17 +0100
commitd1a1dbb8a5e761d4ed38b9840fd09c1494d11e7b (patch)
tree3e59b580e72136df37ef5feabd94f2fbc2a70a71
parent60cebe6b3848055ce47b65117b33f63bfdcaf05b (diff)
downloadpoky-d1a1dbb8a5e761d4ed38b9840fd09c1494d11e7b.tar.gz
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. (From OE-Core rev: 5207169b9c6c4b05c6b043745905a5498adca1a3) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/combo-layer2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer
index 2d100bebdf..8637addc8e 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -587,7 +587,7 @@ def action_pull(conf, args):
587 branch = repo.get('branch', "master") 587 branch = repo.get('branch', "master")
588 runcmd("git checkout %s" % branch, ldir) 588 runcmd("git checkout %s" % branch, ldir)
589 logger.info("git pull for component repo %s in %s ..." % (name, ldir)) 589 logger.info("git pull for component repo %s in %s ..." % (name, ldir))
590 output=runcmd("git pull", ldir) 590 output=runcmd("git pull --ff-only", ldir)
591 logger.info(output) 591 logger.info(output)
592 592
593def action_update(conf, args): 593def action_update(conf, args):