[Intel-gfx] [dim PATCH 2/2] dim: fetch drm-tip before rebuilding

Jani Nikula jani.nikula at intel.com
Tue Nov 29 16:17:16 UTC 2016


Without this, my non-git-worktree setup will fail to push (or it takes
forever) if the local drm-tip is not up to date.

Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
 dim | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dim b/dim
index 562cbc64c93e..6371c95885a8 100755
--- a/dim
+++ b/dim
@@ -424,6 +424,12 @@ function dim_rebuild_tip
 		exit 1
 	fi
 
+	echo -n "Fetching drm-tip (local remote $remote)... "
+	remote=$(url_to_remote $drm_tip_ssh)
+	# git fetch returns 128 if there's nothing to be fetched
+	git fetch -q $remote || true
+	echo "Done."
+
 	for repo in "${!drm_tip_repos[@]}"; do
 		url=${drm_tip_repos[$repo]}
 		remote=$(url_to_remote $url)
-- 
2.1.4



More information about the Intel-gfx mailing list