diff --git a/dim b/dim index 68db3e380f696d484fd5f7394375954410c55044..a2d1a9294778c1a12cf49f225dbecdf381fc31ca 100755 --- a/dim +++ b/dim @@ -350,8 +350,8 @@ case "$subcommand" in git reset --hard $DIM_DRM_INTEL_REMOTE/drm-intel-next # TODO: Restore -nightly merge state from the rerere-cache # branch - test -d $DIM_PREFIX/drm-intel-rerere/ || mkdir $DIM_PREFIX/drm-intel-rerere/ cd $DIM_PREFIX/drm-intel-rerere/ + git fetch origin cp rr-cache/* $DIM_PREFIX/drm-intel-nightly/.git/rr-cache/ -r rm $DIM_PREFIX/*fixup.patch &> /dev/null || true cp *.patch $DIM_PREFIX &> /dev/null || true