Skip to contentSkip to conversation

dim: use prep_pull_mail_overview for drm-intel-testing

PATCH In review Jani Nikula 2 participants 4 messages Oct 2, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 dim: use prep_pull_mail_overview for drm-intel-testing

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

---
 dim | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
dim +2 -6
index bfa6ef010806..866a420d4ef6 100755
@@ -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" \
Signature · 6 lines
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH 2/2 dim: strip signatures out of the pull mail overviews

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

---
 dim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
dim +1 -1
index 866a420d4ef6..fc16d114632f 100755
@@ -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
Signature · 6 lines
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw
In reply to Jani Nikula
Quoted 4 lines · Jani Nikula

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

Ack on both patches in this series.
-Daniel

Quoted 26 lines
---
 dim | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
dim +2 -6
index bfa6ef010806..866a420d4ef6 100755
@@ -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" \
Signature · 1 line
2.11.0
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw
Quoted 7 lines · Daniel Vetter
Quoted 4 lines · Jani Nikula

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

Ack on both patches in this series.

Pushed, thanks.

BR,
Jani.

Quoted 27 lines

-Daniel

Quoted 26 lines
---
 dim | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
dim +2 -6
index bfa6ef010806..866a420d4ef6 100755
@@ -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" \
Signature · 1 line
2.11.0
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx