[PATCH 5/6] dim: support master branch usage for maintainer-tools update

[Daniel Vetter]

On Fri, Jan 11, 2019 at 05:06:02PM +0200, Jani Nikula wrote:
> The default repository is master nowadays.
> 
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>

On 5&6: Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>

> ---
>  dim | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/dim b/dim
> index d083f5558b5e..09eb801b2704 100755
> --- a/dim
> +++ b/dim
> @@ -2046,8 +2046,8 @@ function dim_update_branches
>  	done
>  
>  	cd $DIM_PREFIX/maintainer-tools
> -	if git_is_current_branch maintainer-tools ; then
> -		echo "Updating maintainer-tools ..."
> +	if git_is_current_branch master || git_is_current_branch maintainer-tools; then
> +		echo "Updating maintainer-tools..."
>  		git pull --rebase
>  	fi
>  
> -- 
> 2.20.1
> 
> _______________________________________________
> dim-tools mailing list
> dim-tools at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dim-tools

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