Hi Michael Can we enable these checks for meta-openembedded repo as well
On Fri, Jan 11, 2019 at 11:03 AM Michael Halstead < mhalst...@linuxfoundation.org> wrote: > If the local HEAD is a patchtest generated merge commit patchtest may be > unable > to apply new patches. This should prevent patchtest from becoming stuck > in that state. > > Signed-off-by: Michael Halstead <mhalst...@linuxfoundation.org> > --- > scripts/create-share-folder | 2 +- > scripts/host | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/scripts/create-share-folder b/scripts/create-share-folder > index 861da4b..9432cb1 100755 > --- a/scripts/create-share-folder > +++ b/scripts/create-share-folder > @@ -122,7 +122,7 @@ function update_repository() { > ( > cd $REPODIR > git am --abort --quiet > - git reset --hard --quiet > + git reset --hard --quiet FETCH_HEAD > git clean -f -e ".git-pw*" --quiet > ) > > diff --git a/scripts/host b/scripts/host > index 85f0e4a..893ce63 100755 > --- a/scripts/host > +++ b/scripts/host > @@ -83,7 +83,7 @@ function clean() { > ( > cd $path > git am --abort > - git reset --hard > + git reset --hard FETCH_HEAD > git clean -f -e ".git-pw*" > ) > } > -- > 2.17.2 > > -- > _______________________________________________ > yocto mailing list > yocto@yoctoproject.org > https://lists.yoctoproject.org/listinfo/yocto >
-- _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto