[PATCH] dim: No more silent pushes to for-linux-next* branches

[Jani Nikula]

On Thu, 08 Aug 2019, Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
> Ever since
>
> commit 0dee4cb65f405c8f3236e2bd70005f2f93571852
> Author: Daniel Vetter <daniel.vetter at ffwll.ch>
> Date:   Wed Nov 16 17:34:13 2016 +0100
>
>     dim: Make update_linux_next multi-repo compliant
>
> this shouldn't be a problem anymore, but I only commented one fo them
> out and must have forgotten about this all.
>
> Reported-by: Sam Ravnborg <sam at ravnborg.org>
> Cc: Sam Ravnborg <sam at ravnborg.org>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>

Reviewed-by: Jani Nikula <jani.nikula at intel.com>

> ---
>  dim | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/dim b/dim
> index 7ecbaacfbf87..4e5179d32a88 100755
> --- a/dim
> +++ b/dim
> @@ -536,14 +536,14 @@ function update_linux_next # branch next next-fixes fixes
>  
>  	# always update drm-intel-fixes
>  	echo -n "Pushing $linux_fixes to for-linux-next-fixes... "
> -	git_push $remote +$remote/$linux_fixes:for-linux-next-fixes # >& /dev/null
> +	git_push $remote +$remote/$linux_fixes:for-linux-next-fixes
>  	echo "Done."
>  
>  	if git merge-base --is-ancestor $remote/$linux_next_fixes $remote/$linux_fixes ; then
>  		# -fixes has caught up to dinf, i.e. we're out of the merge
>  		# window. Push the next queue.
>  		echo -n "Out of merge window. Pushing $linux_next to for-linux-next... "
> -		git_push $remote +$remote/$linux_next:for-linux-next >& /dev/null
> +		git_push $remote +$remote/$linux_next:for-linux-next
>  		echo "Done."
>  	else
>  		# dinf is ahead of -fixes, i.e. drm-next has already closed for
> @@ -551,7 +551,7 @@ function update_linux_next # branch next next-fixes fixes
>  		# for the current -next cycle. Push dinf
>  
>  		echo -n "Pushing $linux_next_fixes to for-linux-next... "
> -		git_push $remote +$remote/$linux_next_fixes:for-linux-next >& /dev/null
> +		git_push $remote +$remote/$linux_next_fixes:for-linux-next
>  		echo "Done."
>  	fi
>  }

-- 
Jani Nikula, Intel Open Source Graphics Center