From: Steve Sakoman <st...@sakoman.com> We were mistakenly doing a force push if the branch was in either BUILD_HISTORY_FORKPUSH or BUILD_HISTORY_DIRECTPUSH.
Now we force push for branches in BUILD_HISTORY_FORKPUSH, regular push for branches in BUILD_HISTORY_DIRECTPUSH, and no push if the branch is in neither list. Signed-off-by: Steve Sakoman <st...@sakoman.com> Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org> --- scripts/send-qa-email | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/send-qa-email b/scripts/send-qa-email index 7dbc290..a265a7c 100755 --- a/scripts/send-qa-email +++ b/scripts/send-qa-email @@ -77,10 +77,10 @@ if 'poky' in repos and os.path.exists(resulttool) and args.results_dir: extraopts = None subprocess.check_call([resulttool, "store", args.results_dir, tempdir]) - if basebranch: + if comparebranch: subprocess.check_call(["git", "push", "--all", "--force"], cwd=tempdir) subprocess.check_call(["git", "push", "--tags", "--force"], cwd=tempdir) - else: + elif basebranch: subprocess.check_call(["git", "push", "--all"], cwd=tempdir) subprocess.check_call(["git", "push", "--tags"], cwd=tempdir) -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#50487): https://lists.yoctoproject.org/g/yocto/message/50487 Mute This Topic: https://lists.yoctoproject.org/mt/76695576/21656 Group Owner: yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-