diff options
author | Patrick Ohly <patrick.ohly@intel.com> | 2015-08-04 18:24:00 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-09 00:12:42 -0700 |
commit | ad4d3b1da190cf08c6ac5f9a94a2a1c4980a184d (patch) | |
tree | e1c332e0b3a0fb99674a076ca4ced54993666fcb /meta/recipes-graphics/wayland | |
parent | 00d01468a692faf4272894dd328e8c532bcf8b49 (diff) | |
download | openembedded-core-ad4d3b1da190cf08c6ac5f9a94a2a1c4980a184d.tar.gz openembedded-core-ad4d3b1da190cf08c6ac5f9a94a2a1c4980a184d.tar.bz2 openembedded-core-ad4d3b1da190cf08c6ac5f9a94a2a1c4980a184d.zip |
combo-layer: fix action_pull for unknown branch
When reconfiguring the branch to something not already fetched,
action_pull fails with
error: pathspec '<new branch name>' did not match any file(s) known to git.
It is the "git checkout" which fails like that. To solve this,
try the faster "git checkout + git pull" first and only if that fails,
fall back to the slow "git fetch + git checkout".
In the conf.hard_reset case, do the checkout always after the git fetch.
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/wayland')
0 files changed, 0 insertions, 0 deletions