[PATCH 2/6] dim: simplify rebuild-tip output

Daniel Vetter daniel at ffwll.ch
Fri Jan 11 15:14:34 UTC 2019


On Fri, Jan 11, 2019 at 05:05:59PM +0200, Jani Nikula wrote:
> If the dim repo name matches the git remote, only print the repo name.
> 
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>

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

> ---
>  dim | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/dim b/dim
> index 36fe3c41c555..e502511f5063 100755
> --- a/dim
> +++ b/dim
> @@ -724,7 +724,11 @@ function dim_rebuild_tip
>  		remote=$(repo_to_remote $repo)
>  		sha1=$remote/$branch
>  
> -		echo -n "Merging $repo (local remote $remote) $branch... "
> +		if [[ "$repo" = "$remote" ]]; then
> +			echo -n "Merging $repo/$branch... "
> +		else
> +			echo -n "Merging $repo/$branch (local remote $remote)... "
> +		fi
>  
>  		if [[ -n "$override" ]]; then
>  			sha1=$override
> -- 
> 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


More information about the dim-tools mailing list