From: Ed Bartosh Date: Wed, 23 Sep 2015 22:34:54 +0000 (-0700) Subject: toaster: use git reset --hard instead of rebase X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3641a8422e67890410594453b8baf362c27df2b;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git toaster: use git reset --hard instead of rebase Replaced 'git checkout && 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] Signed-off-by: Ed Bartosh Signed-off-by: brian avery Signed-off-by: Richard Purdie --- diff --git a/lib/toaster/bldcontrol/localhostbecontroller.py b/lib/toaster/bldcontrol/localhostbecontroller.py index e2d9375d318..e9f8c2a7ec8 100644 --- a/lib/toaster/bldcontrol/localhostbecontroller.py +++ b/lib/toaster/bldcontrol/localhostbecontroller.py @@ -268,7 +268,7 @@ class LocalhostBEController(BuildEnvironmentController): # branch magic name "HEAD" will inhibit checkout if commit != "HEAD": logger.debug("localhostbecontroller: checking out commit %s to %s " % (commit, localdirname)) - self._shellcmd("git fetch --all && git checkout \"%s\" && git rebase \"origin/%s\"" % (commit, commit) , localdirname) + self._shellcmd('git fetch --all && git reset --hard "origin/%s"' % commit, localdirname) # take the localdirname as poky dir if we can find the oe-init-build-env if self.pokydirname is None and os.path.exists(os.path.join(localdirname, "oe-init-build-env")):