summaryrefslogtreecommitdiff
path: root/tcwg-update-tested.sh
diff options
context:
space:
mode:
authorMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2018-08-10 08:24:32 +0000
committerMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2018-08-10 08:24:32 +0000
commit070eee025afce9841d5407a01bd2ab3e11348b6f (patch)
tree15016c660ab7cffc0bd10d7e0d57e4c13f284589 /tcwg-update-tested.sh
parent1a95dedef152635636c75b6ceb29bd6ae6bf6d41 (diff)
tcwg-update-tested: Remove stale rebase directory (if any).
Change-Id: I8aebd07199319b7b6c063870b27883f342f4adde
Diffstat (limited to 'tcwg-update-tested.sh')
-rwxr-xr-xtcwg-update-tested.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/tcwg-update-tested.sh b/tcwg-update-tested.sh
index 41a8f032..a3111f5e 100755
--- a/tcwg-update-tested.sh
+++ b/tcwg-update-tested.sh
@@ -39,6 +39,8 @@ if [ x"$(git diff HEAD $GIT_COMMIT_2 | wc -l)" != x"0" ]; then
fi
# Generate gerrit's Change-Id
git commit --amend -C HEAD
+ # Make sure there's no stale rebase from previous review.
+ rm -rf .git/rebase-merge
# Submit review against tcwg-llvmprod branch
git review -y tcwg-tested
ssh -p29418 review.linaro.org gerrit review --code-review 2 --submit $(git rev-parse HEAD)