[PATCH] dim: Fix -d for apply-pull

[Jani Nikula]

On Mon, 14 May 2018, Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
> Lots of things we didn't mark up. Reported by Dave.
>
> Cc: Dave Airlie <airlied at gmail.com>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>

The dry run is a bit hit and miss, which can be dangerous.

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


> ---
>  dim | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/dim b/dim
> index 0c979a48bcd2..9ec43df08c4a 100755
> --- a/dim
> +++ b/dim
> @@ -952,14 +952,14 @@ function dim_apply_pull
>  
>  			return 1
>  		else
> -			git add -u
> -			git commit --no-edit --quiet
> +			$DRY git add -u
> +			$DRY git commit --no-edit --quiet
>  		fi
>  	fi
>  
> -	git commit --amend -s --no-edit
> +	$DRY git commit --amend -s --no-edit
>  	if [ -n "$message_id" ]; then
> -		dim_commit_add_tag "Link: https://patchwork.freedesktop.org/patch/msgid/$message_id"
> +		$DRY dim_commit_add_tag "Link: https://patchwork.freedesktop.org/patch/msgid/$message_id"
>  	fi

-- 
Jani Nikula, Intel Open Source Technology Center