scripts: Reset working repository to match origin during clean up
PATCH 1/1 scripts: Reset working repository to match origin during clean up
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.
--- scripts/create-share-folder | 2 +- scripts/host | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
scripts/create-share-folder +1 -1
@@ -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 )
scripts/host +1 -1
@@ -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*" ) }
Signature · 1 line
2.17.2
Hi Michael
Can we enable these checks for meta-openembedded repo as well
Quoted 46 lines · Michael Halstead
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 <[email protected]>--- scripts/create-share-folder | 2 +- scripts/host | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)scripts/create-share-folder +1
-1@@ -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 )scripts/host +1
-2@@ -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
[email protected]
https://lists.yoctoproject.org/listinfo/yocto
Since these commands run in $REPODIR and $path I think they will apply to any repository under test.
Quoted 54 lines · Khem Raj
Hi Michael
Can we enable these checks for meta-openembedded repo as well
On Fri, Jan 11, 2019 at 11:03 AM Michael Halstead <[email protected] <mailto:[email protected]>> 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 <[email protected] <mailto:[email protected]>> --- 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 [email protected] <mailto:[email protected]> https://lists.yoctoproject.org/listinfo/yocto
Signature · 2 lines
Michael Halstead Linux Foundation / SysAdmin
OK then I need to understand how this will be invoked for meta-openembedded repos
Quoted 59 lines · Michael Halstead
Since these commands run in $REPODIR and $path I think they will apply to any repository under test.
On 1/11/19 12:25 PM, Khem Raj wrote:
Hi Michael
Can we enable these checks for meta-openembedded repo as well
Quoted 40 lines · Michael Halstead
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 <[email protected]>--- scripts/create-share-folder | 2 +- scripts/host | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)scripts/create-share-folder +1
-1@@ -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 )scripts/host +1
-2@@ -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
Quoted 5 lines
--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto--
Michael Halstead
Linux Foundation / SysAdmin
Quoted 2 lines · Khem Raj
OK then I need to understand how this will be invoked for meta-openembedded repos
I think that is beyond the scope of this patch. Can you clarify a bit more? Or perhaps this topic deserves its own thread on an OE list.
Quoted 58 lines
Quoted 56 lines · Michael Halstead
Since these commands run in $REPODIR and $path I think they will apply to any repository under test.
On 1/11/19 12:25 PM, Khem Raj wrote:
Hi Michael
Can we enable these checks for meta-openembedded repo as well
Quoted 39 lines · Michael Halstead
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 <[email protected]>--- scripts/create-share-folder | 2 +- scripts/host | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)scripts/create-share-folder +1
-1@@ -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 )scripts/host +1
-2@@ -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
Quoted 5 lines
--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto--
Michael Halstead
Linux Foundation / SysAdmin
Signature · 2 lines
Michael Halstead Linux Foundation / SysAdmin