aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/contrib
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-09-22 17:21:22 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-22 18:12:53 +0100
commit21fdbd76f458b70a6646dd6d0749e3a465ebd320 (patch)
treee94e6857500fc4a873b2b93f890a23d5650027ad /scripts/contrib
parent47c1ff11a9b8b1e9f40ffb2b3d387252200cf0ec (diff)
downloadopenembedded-core-contrib-21fdbd76f458b70a6646dd6d0749e3a465ebd320.tar.gz
lib/oe/patch: fix for git am not cleaning up after itself
Unfortunately it appears that under certain circumstances, a failed git am followed by git am --abort won't clean up any changes the patch might have made - this was seen when running "devtool extract" on the unzip recipe; unzip-6.0_overflow3.diff has a malformed date as far as git am is concerned but it triggers this condition. Add a git reset --hard HEAD followed by git clean -f in order to recover from this scenario. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/contrib')
0 files changed, 0 insertions, 0 deletions