From 5207169b9c6c4b05c6b043745905a5498adca1a3 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Wed, 8 Jul 2015 13:59:48 +0300 Subject: 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 Signed-off-by: Ross Burton --- scripts/combo-layer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/combo-layer') 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): -- cgit v1.2.3