public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
* [PATCH 1/2] dim: use prep_pull_mail_overview for drm-intel-testing
@ 2017-10-02  9:45 Jani Nikula
  2017-10-02  9:45 ` [PATCH 2/2] dim: strip signatures out of the pull mail overviews Jani Nikula
  2017-10-02 13:22 ` [PATCH 1/2] dim: use prep_pull_mail_overview for drm-intel-testing Daniel Vetter
  0 siblings, 2 replies; 4+ messages in thread
From: Jani Nikula @ 2017-10-02  9:45 UTC (permalink / raw)
  To: intel-gfx; +Cc: jani.nikula

It's not perfect or exactly the same, but prefer fewer lines of special
casing anyway.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 dim | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/dim b/dim
index bfa6ef010806..866a420d4ef6 100755
--- a/dim
+++ b/dim
@@ -1615,12 +1615,8 @@ function dim_update_next_continue
 		The following changes tagged $tag_testing:
 
 		HERE
-	obj=$(git rev-parse $tag)
-	if [[ "$(git cat-file -t $obj)" == "tag" ]] ; then
-		git cat-file -p $obj | tail -n+6 >> $req_file
-	else
-		echo "*** CHANGELOG OVERVIEW HERE ***" >> $req_file
-	fi
+
+	prep_pull_mail_overview "$tag" >> $req_file
 	prep_pull_mail_signature >> $req_file
 
 	$DRY $DIM_MUA -s "Updated drm-intel-testing" \
-- 
2.11.0

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

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 2/2] dim: strip signatures out of the pull mail overviews
  2017-10-02  9:45 [PATCH 1/2] dim: use prep_pull_mail_overview for drm-intel-testing Jani Nikula
@ 2017-10-02  9:45 ` Jani Nikula
  2017-10-02 13:22 ` [PATCH 1/2] dim: use prep_pull_mail_overview for drm-intel-testing Daniel Vetter
  1 sibling, 0 replies; 4+ messages in thread
From: Jani Nikula @ 2017-10-02  9:45 UTC (permalink / raw)
  To: intel-gfx; +Cc: jani.nikula

Signed tags have the signature at the end. Strip them out when preparing
pull mail overviews.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 dim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dim b/dim
index 866a420d4ef6..fc16d114632f 100755
--- a/dim
+++ b/dim
@@ -1483,7 +1483,7 @@ function prep_pull_mail_overview
 			obj=$(git rev-parse $tag)
 			if [[ "$(git cat-file -t $obj)" == "tag" ]] ; then
 				echo $tag:
-				git cat-file -p $obj | tail -n+6
+				git cat-file -p $obj | tail -n+6 | sed -n '/^-----BEGIN PGP SIGNATURE-----$/q;p'
 			fi
 		done
 	fi
-- 
2.11.0

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

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/2] dim: use prep_pull_mail_overview for drm-intel-testing
  2017-10-02  9:45 [PATCH 1/2] dim: use prep_pull_mail_overview for drm-intel-testing Jani Nikula
  2017-10-02  9:45 ` [PATCH 2/2] dim: strip signatures out of the pull mail overviews Jani Nikula
@ 2017-10-02 13:22 ` Daniel Vetter
  2017-10-02 13:50   ` Jani Nikula
  1 sibling, 1 reply; 4+ messages in thread
From: Daniel Vetter @ 2017-10-02 13:22 UTC (permalink / raw)
  To: Jani Nikula; +Cc: intel-gfx

On Mon, Oct 02, 2017 at 12:45:19PM +0300, Jani Nikula wrote:
> It's not perfect or exactly the same, but prefer fewer lines of special
> casing anyway.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Ack on both patches in this series.
-Daniel
> ---
>  dim | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/dim b/dim
> index bfa6ef010806..866a420d4ef6 100755
> --- a/dim
> +++ b/dim
> @@ -1615,12 +1615,8 @@ function dim_update_next_continue
>  		The following changes tagged $tag_testing:
>  
>  		HERE
> -	obj=$(git rev-parse $tag)
> -	if [[ "$(git cat-file -t $obj)" == "tag" ]] ; then
> -		git cat-file -p $obj | tail -n+6 >> $req_file
> -	else
> -		echo "*** CHANGELOG OVERVIEW HERE ***" >> $req_file
> -	fi
> +
> +	prep_pull_mail_overview "$tag" >> $req_file
>  	prep_pull_mail_signature >> $req_file
>  
>  	$DRY $DIM_MUA -s "Updated drm-intel-testing" \
> -- 
> 2.11.0
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/2] dim: use prep_pull_mail_overview for drm-intel-testing
  2017-10-02 13:22 ` [PATCH 1/2] dim: use prep_pull_mail_overview for drm-intel-testing Daniel Vetter
@ 2017-10-02 13:50   ` Jani Nikula
  0 siblings, 0 replies; 4+ messages in thread
From: Jani Nikula @ 2017-10-02 13:50 UTC (permalink / raw)
  To: Daniel Vetter; +Cc: intel-gfx

On Mon, 02 Oct 2017, Daniel Vetter <daniel@ffwll.ch> wrote:
> On Mon, Oct 02, 2017 at 12:45:19PM +0300, Jani Nikula wrote:
>> It's not perfect or exactly the same, but prefer fewer lines of special
>> casing anyway.
>> 
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> Ack on both patches in this series.

Pushed, thanks.

BR,
Jani.

> -Daniel
>> ---
>>  dim | 8 ++------
>>  1 file changed, 2 insertions(+), 6 deletions(-)
>> 
>> diff --git a/dim b/dim
>> index bfa6ef010806..866a420d4ef6 100755
>> --- a/dim
>> +++ b/dim
>> @@ -1615,12 +1615,8 @@ function dim_update_next_continue
>>  		The following changes tagged $tag_testing:
>>  
>>  		HERE
>> -	obj=$(git rev-parse $tag)
>> -	if [[ "$(git cat-file -t $obj)" == "tag" ]] ; then
>> -		git cat-file -p $obj | tail -n+6 >> $req_file
>> -	else
>> -		echo "*** CHANGELOG OVERVIEW HERE ***" >> $req_file
>> -	fi
>> +
>> +	prep_pull_mail_overview "$tag" >> $req_file
>>  	prep_pull_mail_signature >> $req_file
>>  
>>  	$DRY $DIM_MUA -s "Updated drm-intel-testing" \
>> -- 
>> 2.11.0
>> 

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2017-10-02 13:51 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-02  9:45 [PATCH 1/2] dim: use prep_pull_mail_overview for drm-intel-testing Jani Nikula
2017-10-02  9:45 ` [PATCH 2/2] dim: strip signatures out of the pull mail overviews Jani Nikula
2017-10-02 13:22 ` [PATCH 1/2] dim: use prep_pull_mail_overview for drm-intel-testing Daniel Vetter
2017-10-02 13:50   ` Jani Nikula

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox