[PATCH] drm/ci: remove rebase-merge directory

[Helen Koike]

On 02/12/2023 19:13, Dmitry Baryshkov wrote:
> Gitlab runner can cache git repository, including the unfinished rebase
> merge status. New CI job will come as a fresh checkout, however this
> will not destroy the unfinished rebase, failing our build script.
> Destroy the unfinished rebase state.
> 
> Suggested-by: David Heidelberg <david.heidelberg at collabora.com>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov at linaro.org>

Acked-by: Helen Koike <helen.koike at collabora.com>

Thanks!
Helen

> ---
>   drivers/gpu/drm/ci/build.sh | 3 +++
>   1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/gpu/drm/ci/build.sh b/drivers/gpu/drm/ci/build.sh
> index e5c5dcedd108..ca2923ed2290 100644
> --- a/drivers/gpu/drm/ci/build.sh
> +++ b/drivers/gpu/drm/ci/build.sh
> @@ -58,6 +58,9 @@ git config --global user.email "fdo at example.com"
>   git config --global user.name "freedesktop.org CI"
>   git config --global pull.rebase true
>   
> +# cleanup git state on the worker
> +rm -rf .git/rebase-merge
> +
>   # Try to merge fixes from target repo
>   if [ "$(git ls-remote --exit-code --heads ${UPSTREAM_REPO} ${TARGET_BRANCH}-external-fixes)" ]; then
>       git pull ${UPSTREAM_REPO} ${TARGET_BRANCH}-external-fixes