]> code.ossystems Code Review - openembedded-core.git/commit
combo-layer: fix action_pull for unknown branch
authorPatrick Ohly <patrick.ohly@intel.com>
Tue, 4 Aug 2015 16:24:00 +0000 (18:24 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 9 Aug 2015 07:12:42 +0000 (00:12 -0700)
commitad4d3b1da190cf08c6ac5f9a94a2a1c4980a184d
treee1c332e0b3a0fb99674a076ca4ced54993666fcb
parent00d01468a692faf4272894dd328e8c532bcf8b49
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>
scripts/combo-layer