From 070eee025afce9841d5407a01bd2ab3e11348b6f Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Fri, 10 Aug 2018 08:24:32 +0000 Subject: tcwg-update-tested: Remove stale rebase directory (if any). Change-Id: I8aebd07199319b7b6c063870b27883f342f4adde --- tcwg-update-tested.sh | 2 ++ 1 file changed, 2 insertions(+) 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) -- cgit v1.2.3