diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-06-04 09:56:45 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-06-04 09:56:45 +0000 |
| commit | 2e4e25441ec5c06c8f27b2901620e6107714be5b (patch) | |
| tree | a14d4feccdd4a163d2c4be07820c1bd4f02553cd /tcwg-update-tested.sh | |
| parent | 7d7f737be0421d136e3c5361090330aea0d680e4 (diff) | |
tcwg-update-tested: Avoid interactive questions.
Change-Id: If1ba5a74b988a55ee04d252cec8bf064c952cd97
Diffstat (limited to 'tcwg-update-tested.sh')
| -rwxr-xr-x | tcwg-update-tested.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tcwg-update-tested.sh b/tcwg-update-tested.sh index fb161f12..41a8f032 100755 --- a/tcwg-update-tested.sh +++ b/tcwg-update-tested.sh @@ -29,18 +29,18 @@ pushd dockerfiles GIT_COMMIT_2=$(git rev-parse $GIT_COMMIT_2) git review -s git checkout -B tcwg-tested origin/tcwg-tested -if [ x"$(git diff HEAD $GIT_COMMIT_2)" != x"" ]; then +if [ x"$(git diff HEAD $GIT_COMMIT_2 | wc -l)" != x"0" ]; then # Make sure to generate merge commit so that we can attach gerrit's Change-Id to it git merge --no-ff -X theirs $GIT_COMMIT_2 # Make sure there are no differences between merge result and $GIT_COMMIT_2 - if [ x"$(git diff HEAD $GIT_COMMIT_2)" != x"" ]; then + if [ x"$(git diff HEAD $GIT_COMMIT_2 | wc -l)" != x"0" ]; then echo "ERROR: dockerfiles merge not clean" exit 1 fi # Generate gerrit's Change-Id git commit --amend -C HEAD # Submit review against tcwg-llvmprod branch - git review tcwg-tested + git review -y tcwg-tested ssh -p29418 review.linaro.org gerrit review --code-review 2 --submit $(git rev-parse HEAD) fi popd |