summaryrefslogtreecommitdiff
path: root/scripts
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:08:40 +0100
commit5207169b9c6c4b05c6b043745905a5498adca1a3 (patch)
treeadbff1bbbf0a26648b0db4b44c71aa0739798762 /scripts
parentcef4de5cd6c12091146dc1ef02cd80e094c6728e (diff)
downloadopenembedded-core-5207169b9c6c4b05c6b043745905a5498adca1a3.tar.gz
openembedded-core-5207169b9c6c4b05c6b043745905a5498adca1a3.tar.bz2
openembedded-core-5207169b9c6c4b05c6b043745905a5498adca1a3.zip
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@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts')
-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):
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):