summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-09-23 15:34:54 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-29 14:11:39 +0100
commit693934031ab26d22793e5bddbcc998473ca5bf42 (patch)
treed68d80546ff5d3965e36a5de95ef3043996d13cc
parent3d73dfa2236c35924c2cee4b02c4c85656df6f25 (diff)
downloadpoky-693934031ab26d22793e5bddbcc998473ca5bf42.tar.gz
bitbake: toaster: use git reset --hard instead of rebase
Replaced 'git checkout <ref> && git rebase' with 'git reset --hard' as with git checkout repository ends up with detached HEAD. Rebase makes things even worse as it can cause conflicts. git reset --hard resets repository to the required state in a most straightforward and reliable way. [YOCTO #7505] (Bitbake rev: f3641a8422e67890410594453b8baf362c27df2b) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/toaster/bldcontrol/localhostbecontroller.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
index e2d9375d31..e9f8c2a7ec 100644
--- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
@@ -268,7 +268,7 @@ class LocalhostBEController(BuildEnvironmentController):
268 # branch magic name "HEAD" will inhibit checkout 268 # branch magic name "HEAD" will inhibit checkout
269 if commit != "HEAD": 269 if commit != "HEAD":
270 logger.debug("localhostbecontroller: checking out commit %s to %s " % (commit, localdirname)) 270 logger.debug("localhostbecontroller: checking out commit %s to %s " % (commit, localdirname))
271 self._shellcmd("git fetch --all && git checkout \"%s\" && git rebase \"origin/%s\"" % (commit, commit) , localdirname) 271 self._shellcmd('git fetch --all && git reset --hard "origin/%s"' % commit, localdirname)
272 272
273 # take the localdirname as poky dir if we can find the oe-init-build-env 273 # take the localdirname as poky dir if we can find the oe-init-build-env
274 if self.pokydirname is None and os.path.exists(os.path.join(localdirname, "oe-init-build-env")): 274 if self.pokydirname is None and os.path.exists(os.path.join(localdirname, "oe-init-build-env")):