dim: Move maintainer-tools branch to drm-tipmaintainer-tools

Originally I wanted to move it to a completely stand-alone
maintainer-tools.git repo. But that has the problem that we need to
keep track of, and update, yet another remote. Easy way out it to
simply stuff the maintainer-tools branch into drm-tip.

The auto-upgrade hack is a bit gross, but shouldn't really cause
overhead. I've also pushed out the latest maintainer-tools (without
this patch) to drm-tip.git to make sure the patch can be tested.

The neat thing here is that this allows us to finally remove
drm-intel url hardcoding from dim.

v2: Update the docs, I've forgotten about those (Jani)

Cc: Jani Nikula <jani.nikula@linux.intel.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

3 files changed, 16 insertions, 11 deletions

diff --git a/dim b/dim
index 19ba2a0d46f2..da2028f178bc 100755
--- a/dim
+++ b/dim
@@ -131,6 +131,12 @@ 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
@@ -1933,9 +1939,8 @@ function setup_aux_checkout # name url directory
 
 function dim_setup
 {
-	local remote drm_intel_ssh drm_tip_ssh drm_upstream_git linux_upstream_git
+	local remote drm_tip_ssh drm_upstream_git linux_upstream_git
 
-	drm_intel_ssh=ssh://git.freedesktop.org/git/drm-intel
 	drm_tip_ssh=ssh://git.freedesktop.org/git/drm-tip
 	drm_upstream_git=git://people.freedesktop.org/~airlied/linux
 	linux_upstream_git=git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
@@ -1960,7 +1965,7 @@ function dim_setup
 
 	cd $DIM_PREFIX
 
-	setup_aux_checkout maintainer-tools $drm_intel_ssh maintainer-tools
+	setup_aux_checkout maintainer-tools $drm_tip_ssh maintainer-tools
 
 	setup_aux_checkout rerere-cache $drm_tip_ssh drm-rerere
 
@@ -2144,7 +2149,7 @@ function dim_help
 	if [ ! -e "$manpage" ]; then
 		manpage=$(dirname $(readlink -f $0))/dim.rst
 		if [ ! -e "$manpage" ]; then
-			echo "Can't find the man page. See http://cgit.freedesktop.org/drm-intel/tree/dim.rst?h=maintainer-tools"
+			echo "Can't find the man page. See http://cgit.freedesktop.org/drm-tip/tree/dim.rst?h=maintainer-tools"
 			exit 1
 		fi
 	fi
diff --git a/dim.rst b/dim.rst
index 9779e9fbff6f..e2c5fd6e6d0a 100644
--- a/dim.rst
+++ b/dim.rst
@@ -35,11 +35,11 @@ QUICKSTART
 
 For getting started grab the latest dim (drm-intel-maintainer) script from::
 
-    http://cgit.freedesktop.org/drm-intel/tree/dim?h=maintainer-tools
+    http://cgit.freedesktop.org/drm-tip/tree/dim?h=maintainer-tools
 
 There's also a sample config file for ~/.dimrc::
 
-    http://cgit.freedesktop.org/drm-intel/tree/dimrc.sample?h=maintainer-tools
+    http://cgit.freedesktop.org/drm-tip/tree/dimrc.sample?h=maintainer-tools
 
 Plus, there's bash completion in the same directory if you feel like using that.
 Run::
diff --git a/repositories.rst b/repositories.rst
index 202990f82e6c..155fb0f274fc 100644
--- a/repositories.rst
+++ b/repositories.rst
@@ -145,11 +145,6 @@ This is the fastest path to getting fixes to Linus' tree. It is generally for
 the regressions, cc:stable, black screens, GPU hangs only, and should pretty
 much follow the stable rules.
 
-maintainer-tools
-~~~~~~~~~~~~~~~~
-
-This branch contains all the tools and documentation you're reading about.
-
 The DRM Testing and Integration Repository
 ------------------------------------------
 
@@ -174,3 +169,8 @@ rerere`` conflict resolutions for dim to generate drm-tip, as well as some
 kernel defconfig files for build testing.
 
 .. _nightly.conf: https://cgit.freedesktop.org/drm/drm-tip/plain/nightly.conf?h=rerere-cache
+
+maintainer-tools
+~~~~~~~~~~~~~~~~
+
+This branch contains all the tools and documentation you're reading about.