[PATCH] dim: revert auto-upgrade hack
Jani Nikula
jani.nikula at linux.intel.com
Wed Feb 7 10:14:58 UTC 2018
On Fri, 02 Feb 2018, Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
> This is for the new drm-tip/maintainer-tools branch only, to make sure
> that upgrading from drm-intel/maintainer-tools will always be a
> fast-forward. While still being able to retire the hack once upgraded.
I've pushed patch 1 to both drm-intel and drm-tip maintainer-tools
branch, and patch 2 only to drm-tip branch.
This should update everyone to drm-tip.
Fingers crossed.
BR,
Jani.
>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
> ---
> dim | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/dim b/dim
> index 6f2bf0056e4b..9d0a6999e4d1 100755
> --- a/dim
> +++ b/dim
> @@ -131,12 +131,6 @@ function read_integration_config
> dim_branches="$dim_branches $branch"
> fi
> done
> -
> - #this is a bit a hack
> - (
> - cd $DIM_PREFIX/maintainer-tools;
> - git config --replace-all branch.maintainer-tools.remote $(repo_to_remote drm-tip)
> - )
> }
>
> function echoerr
--
Jani Nikula, Intel Open Source Technology Center
More information about the dim-tools
mailing list