- Use the https url so we don't require everyone to have their gitlab accounts ready already. Otherwise we'd need to gate migrating maintainer-tools on migrating all the drm kernel repos, and I'd really like to partition the migration. Also, we want to reduce maintainer-tools committers anyway, to shrink the attack surface a lot.
Committers need to either set up the http access tokens, or set up ssh certificates and change their remote for the maintainer-tools repo. - For testing, you can undo this auto-update using $ git remote remove maintainer-tools ; git branch -u drm-tip/maintainer-tools - My plan is that we push an immediate revert of this code to the gitlab repo (and only there) so it doesn't stick around. - fd.o admins recommended that we don't do a read-only copy of maintaienr-tools at the old-place, since it's not a 1:1 match. For everything else we're going to migrate there will be a read-only copy with all urls working nicely, maintainer-tools is the only exception here. v2: Don't forget about dim_setup. v3: Update all the urls in docs! v4: Appease Sean's partially migrated setup. Cc: Sean Paul <[email protected]> Cc: Rodrigo Vivi <[email protected]> Cc: Daniel Stone <[email protected]> Acked-by: Rodrigo Vivi <[email protected]> (v2) Reviewed-by: Daniel Stone <[email protected]> (v2) Signed-off-by: Daniel Vetter <[email protected]> --- dim | 5 +++-- dim.rst | 3 +-- getting-started.rst | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dim b/dim index 3612cc66d1c4..21788886f8b5 100755 --- a/dim +++ b/dim @@ -2030,8 +2030,9 @@ function dim_update_branches fi cd $DIM_PREFIX/maintainer-tools - if ! git remote | grep -q '^maintainer-tools$' ; then - git remote add maintainer-tools $maintainer_tools_https + if git rev-parse --symbolic-full-name @{u} | grep -q 'refs/remotes/drm-tip/maintainer-tools'; then + echo "Migrating maintainer tools." + git remote add maintainer-tools $maintainer_tools_https || true git fetch maintainer-tools git branch --set-upstream-to=maintainer-tools/master else diff --git a/dim.rst b/dim.rst index f33fa57e4cb3..e47337783b49 100644 --- a/dim.rst +++ b/dim.rst @@ -29,8 +29,7 @@ the drm-intel_ and drm-misc_ git repositories. This man page is a command-line reference for the tool only; for more comprehensive documentation, including a getting started guide, see https://01.org/linuxgraphics/gfx-docs/maintainer-tools/index.html, or the same -in source form in the maintainer-tools branch of the drm-tip repository at -https://cgit.freedesktop.org/drm/drm-tip/log/?h=maintainer-tools. +in source form at https://gitlab.freedesktop.org/drm/maintainer-tools. .. _drm-intel: drm-intel.html .. _drm-misc: drm-misc.html diff --git a/getting-started.rst b/getting-started.rst index d035862e3970..5d4ce9c1991e 100644 --- a/getting-started.rst +++ b/getting-started.rst @@ -6,11 +6,11 @@ For getting started grab the latest dim (drm-intel-maintainer) script from:: - http://cgit.freedesktop.org/drm-tip/tree/dim?h=maintainer-tools + https://gitlab.freedesktop.org/drm/maintainer-tools/raw/master/dim There's also a sample config file for ~/.dimrc:: - http://cgit.freedesktop.org/drm-tip/tree/dimrc.sample?h=maintainer-tools + https://gitlab.freedesktop.org/drm/maintainer-tools/raw/master/dimrc.sample Plus, there's bash completion in the same directory if you feel like using that. Run:: -- 2.18.0 _______________________________________________ dim-tools mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dim-tools
