summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2015-08-04 18:24:00 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-09 00:13:57 -0700
commit8b847ffd040fc35d246079eb0b8d51331dc721b5 (patch)
treec7764ac096d2ca71d7a9519332c95c781d193d3d /meta
parentb2a0c2fbd1e4a0808c9594eb283395f5608ba4e9 (diff)
downloadpoky-8b847ffd040fc35d246079eb0b8d51331dc721b5.tar.gz
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. (From OE-Core rev: ad4d3b1da190cf08c6ac5f9a94a2a1c4980a184d) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
0 files changed, 0 insertions, 0 deletions