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

Daniel Vetter daniel at ffwll.ch
Wed Nov 30 10:48:03 UTC 2016


On Tue, Nov 29, 2016 at 06:17:15PM +0200, Jani Nikula wrote:
> Fixes: 6552af2d32c4 ("dim: fix update-branches to fetch all available nightly repos")
> Cc: Archit Taneja <architt at codeaurora.org>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
>  dim | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/dim b/dim
> index 3dd2d1dec796..562cbc64c93e 100755
> --- a/dim
> +++ b/dim
> @@ -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.

> +		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

> +		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
> -- 
> 2.1.4
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the Intel-gfx mailing list