]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commit
toaster: use git reset --hard instead of rebase
authorEd Bartosh <ed.bartosh@linux.intel.com>
Wed, 23 Sep 2015 22:34:54 +0000 (15:34 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 29 Sep 2015 13:11:06 +0000 (14:11 +0100)
commitf3641a8422e67890410594453b8baf362c27df2b
treef57722c939e7ec2b0d6fd0e59f707409a64ff486
parentedac7b7533d50455baaaf05a46b7ace49bb24b95
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]

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>
lib/toaster/bldcontrol/localhostbecontroller.py