summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/combo-layer2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer
index 70dad83217..7380f5b959 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -585,8 +585,8 @@ def action_pull(conf, args):
585 repo = conf.repos[name] 585 repo = conf.repos[name]
586 ldir = repo['local_repo_dir'] 586 ldir = repo['local_repo_dir']
587 branch = repo.get('branch', "master") 587 branch = repo.get('branch', "master")
588 logger.info("update branch %s of component repo %s in %s ..." % (branch, name, ldir))
588 runcmd("git checkout %s" % branch, ldir) 589 runcmd("git checkout %s" % branch, ldir)
589 logger.info("update component repo %s in %s ..." % (name, ldir))
590 if not conf.hard_reset: 590 if not conf.hard_reset:
591 output=runcmd("git pull --ff-only", ldir) 591 output=runcmd("git pull --ff-only", ldir)
592 logger.info(output) 592 logger.info(output)