Skip to contentSkip to conversation

dim fetch fixes

PATCH In review Jani Nikula 2 participants 5 messages Nov 29, 2016 – Nov 30, 2016

lore
Share & tools
lore

Jani Nikula

author
#0 lore raw

cover dim fetch fixes

Fix a couple of issues that probably only plague setups that don't use git-worktree.

We should probably consider adding Linus' tree and drm-tip to drm_tip_repos; drm-tip is rebuilt based on drm_tip_config anyway. Anyway, this is the quick fix.

BR,
Jani.

Jani Nikula (2):
dim: fetch Linus' tree again on update-branches
dim: fetch drm-tip before rebuilding

 dim | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
author
#1 lore raw

PATCH 1/2 dim: fetch Linus' tree again on update-branches

Fixes 6552af2d32c4 ("dim: fix update-branches to fetch all available nightly repos")
Cc Archit Taneja <[email protected]>
Signed-off-by Jani Nikula <[email protected]>
---
 dim | 8 ++++++++
 1 file changed, 8 insertions(+)
dim +8 -0
index 3dd2d1dec796..562cbc64c93e 100755
@@ -1255,6 +1255,14 @@ function dim_update_branches
 	local repo remote
 
 	cd $DIM_PREFIX/$DIM_DRM_INTEL
+
+	if remote=$(url_to_remote $linux_upstream_git 2>/dev/null); then
+		echo -n "Fetching linux (local remote $remote)... "
+		# git fetch returns 128 if there's nothing to be fetched
+		git fetch -q $remote || true
+		echo "Done."
+	fi
+
 	for repo in "${!drm_tip_repos[@]}"; do
 		url=${drm_tip_repos[$repo]}
 		if ! remote=$(url_to_remote $url 2>/dev/null); then
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

Re: [dim PATCH 1/2] dim: fetch Linus' tree again on update-branches

Quoted 12 lines · Jani Nikula
Fixes 6552af2d32c4 ("dim: fix update-branches to fetch all available nightly repos")
Cc Archit Taneja <[email protected]>
Signed-off-by Jani Nikula <[email protected]>
---
 dim | 8 ++++++++
 1 file changed, 8 insertions(+)
dim +0 -0
index 3dd2d1dec796..562cbc64c93e 100755

dim function dim_update_branches · line 1259

Quoted 5 lines
dim +2 -0
@@ -1255,6 +1255,14 @@ function dim_update_branches
 	local repo remote
 
 	cd $DIM_PREFIX/$DIM_DRM_INTEL
+
+	if remote=$(url_to_remote $linux_upstream_git 2>/dev/null); then

We still have a bunch of places where we hardcode origin for Linus' repo. Might want to sed that at one point for consistency ...

But this here is acked.

dim function dim_update_branches · line 1262

Quoted 3 lines
dim +3 -0
+		echo -n "Fetching linux (local remote $remote)... "
+		# git fetch returns 128 if there's nothing to be fetched
+		git fetch -q $remote || true

Another idea: fetch_helper instead of the same 2 lines copypasted everywhere? -Daniel

Quoted 9 lines
dim +3 -0
+		echo "Done."
+	fi
+
 	for repo in "${!drm_tip_repos[@]}"; do
 		url=${drm_tip_repos[$repo]}
 		if ! remote=$(url_to_remote $url 2>/dev/null); then
Signature · 1 line
2.1.4
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
author
#3 lore raw

PATCH 2/2 dim: fetch drm-tip before rebuilding

In reply to Jani Nikula

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 <[email protected]>
---
 dim | 6 ++++++
 1 file changed, 6 insertions(+)
dim +6 -0
index 562cbc64c93e..6371c95885a8 100755
@@ -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)
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#4 lore raw

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

Quoted 4 lines · Jani Nikula

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 <[email protected]>

Ack. No idea why git is dense at this ...
-Daniel

Quoted 24 lines
---
 dim | 6 ++++++
 1 file changed, 6 insertions(+)
dim +6 -0
index 562cbc64c93e..6371c95885a8 100755
@@ -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)
Signature · 1 line
2.1.4
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx