[PATCH] dim: Fixup Link: tag in apply-pull

[PATCH] dim: Fixup Link: tag in apply-pull

[Daniel Vetter]

Somehow fell apart again in testing, let's do the same thing as with
apply-branch, where we also apply the Link: after the sob is added.

Cc: Jani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 dim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dim b/dim
index 588e859cf9e6..33d5fd3c0303 100755
--- a/dim
+++ b/dim
@@ -737,14 +737,14 @@ function dim_apply_pull
 
 	message_id=$(message_get_id $file)
 
+	git commit --amend -s --no-edit
 	if [ -n "$message_id" ]; then
-		dim_commit_add_tag "\nLink: http://patchwork.freedesktop.org/patch/msgid/$message_id"
+		dim_commit_add_tag "Link: http://patchwork.freedesktop.org/patch/msgid/$message_id"
 	else
 		echoerr "WARNING: No message-id found in the patch file."
 		rv=1
 	fi
 
-	git commit --amend -s --no-edit
 
 	eval $DRY $DIM_POST_APPLY_ACTION
 
-- 
2.11.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] dim: Fixup Link: tag in apply-pull

[Jani Nikula]

On Tue, 04 Apr 2017, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> Somehow fell apart again in testing, let's do the same thing as with
> apply-branch, where we also apply the Link: after the sob is added.
>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

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

> ---
>  dim | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/dim b/dim
> index 588e859cf9e6..33d5fd3c0303 100755
> --- a/dim
> +++ b/dim
> @@ -737,14 +737,14 @@ function dim_apply_pull
>  
>  	message_id=$(message_get_id $file)
>  
> +	git commit --amend -s --no-edit
>  	if [ -n "$message_id" ]; then
> -		dim_commit_add_tag "\nLink: http://patchwork.freedesktop.org/patch/msgid/$message_id"
> +		dim_commit_add_tag "Link: http://patchwork.freedesktop.org/patch/msgid/$message_id"
>  	else
>  		echoerr "WARNING: No message-id found in the patch file."
>  		rv=1
>  	fi
>  
> -	git commit --amend -s --no-edit
>  
>  	eval $DRY $DIM_POST_APPLY_ACTION

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx