diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2020-02-10 14:28:36 +0300 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2020-02-10 11:32:11 +0000 |
| commit | 70dc16911c9b438dfff0ee8ad48d2fd5cb355e02 (patch) | |
| tree | 0c0ec684081e40928600bff5507270507358d148 /tcwg-update-tested.sh | |
| parent | 03a87b31a8fcd76b361dfc2fcb21b716413487a3 (diff) | |
tcwg-update-tested.sh: Force push to abe.git and jenkins-scripts.git
Otherwise we get the following error message. Note that both
03a87b31a8fcd76b361dfc2fcb21b716413487a3 and remote refs/heads/tested
are verified to be regular commits. Not sure why this is happening, but
working around this should be OK.
===
00:05:14.720 + git -C jenkins-scripts push gerrit 03a87b31a8fcd76b361dfc2fcb21b716413487a3:refs/heads/tested
00:05:16.027 To ssh://tcwg-buildslave@review.linaro.org:29418/toolchain/jenkins-scripts.git
00:05:16.027 ! [rejected] 03a87b31a8fcd76b361dfc2fcb21b716413487a3 -> tested (needs force)
00:05:16.027 error: failed to push some refs to 'ssh://tcwg-buildslave@review.linaro.org:29418/toolchain/jenkins-scripts.git'
00:05:16.027 hint: You cannot update a remote ref that points at a non-commit object,
00:05:16.027 hint: or update a remote ref to make it point at a non-commit object,
00:05:16.027 hint: without using the '--force' option.
===
Change-Id: I8821f77e37d1faa229a77718c3c322cde62b1e87
Diffstat (limited to 'tcwg-update-tested.sh')
| -rwxr-xr-x | tcwg-update-tested.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tcwg-update-tested.sh b/tcwg-update-tested.sh index a68cabc8..ddc1e35a 100755 --- a/tcwg-update-tested.sh +++ b/tcwg-update-tested.sh @@ -22,8 +22,8 @@ if [ x"$USER" = x"tcwg-buildslave" ]; then git config --global user.name "TCWG Buildslave" git config --global user.email tcwg-buildslave@linaro.org fi -git -C abe push gerrit $GIT_COMMIT:refs/heads/tested -git -C jenkins-scripts push gerrit $GIT_COMMIT_1:refs/heads/tested +git -C abe push -f gerrit $GIT_COMMIT:refs/heads/tested +git -C jenkins-scripts push -f gerrit $GIT_COMMIT_1:refs/heads/tested pushd dockerfiles GIT_COMMIT_2=$(git rev-parse $GIT_COMMIT_2) |