[PATCH] dim: make update-branches update drm-next

[Joonas Lahtinen]

Update drm-next branch if it exists, to avoid incomplete backmerges.

Signed-off-by: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
---
 dim | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dim b/dim
index ed26033f5aba..071e8d019156 100755
--- a/dim
+++ b/dim
@@ -1862,6 +1862,12 @@ function dim_update_branches
 		dim_checkout drm-intel-next
 		$DRY git reset --hard $intel_remote/drm-intel-next
 	fi
+	if git_branch_exists drm-next ; then
+		drm_remote=$(repo_to_remote drm-upstream)
+
+		dim_checkout drm-next
+		$DRY git reset --hard $drm_remote/drm-next
+	fi
 
 	cd $DIM_PREFIX/maintainer-tools
 	if git_is_current_branch maintainer-tools ; then
-- 
2.14.3