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>
This commit is contained in:
parent
60cebe6b38
commit
d1a1dbb8a5
|
@ -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):
|
||||
|
|
Loading…
Reference in New Issue