On Tue, Aug 28, 2018 at 09:31:20PM +0200, Daniel Vetter wrote: > - 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. > > Signed-off-by: Daniel Vetter <daniel.vet...@intel.com>
Acked-by: Rodrigo Vivi <rodrigo.v...@intel.com> > --- > dim | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > > diff --git a/dim b/dim > index 5040d6b046b2..a4050870503d 100755 > --- a/dim > +++ b/dim > @@ -76,6 +76,8 @@ dim=$(basename $0) > dim_today=$(date +%Y-%m-%d) > dim_timestamp="$(date --utc +%Yy-%mm-%dd-%Hh-%Mm-%Ss) UTC" > > +maintainer_tools_https=https://gitlab.freedesktop.org/drm/maintainer-tools.git > + > # Recipients for all dim based pull requests. > # Add To: lines to the end, Cc: lines in the beginning with -c. > dim_pull_request_recipients=( > @@ -1996,6 +1998,14 @@ 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 > + git fetch maintainer-tools > + git branch --set-upstream-to=maintainer-tools/master > + else > + echo "Maintainer tools already migrated." > + fi > + > if git_is_current_branch maintainer-tools ; then > echo "Updating maintainer-tools ..." > git pull --rebase > @@ -2092,7 +2102,7 @@ function dim_setup > > cd $DIM_PREFIX > > - setup_aux_checkout maintainer-tools $drm_tip_ssh maintainer-tools > + setup_aux_checkout maintainer-tools $maintainer_tools_https > maintainer-tools > > setup_aux_checkout rerere-cache $drm_tip_ssh drm-rerere > > -- > 2.18.0 > > _______________________________________________ > dim-tools mailing list > dim-tools@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dim-tools _______________________________________________ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
