Skip to contentSkip to conversation

dim: add more <> around Cc'd mailing list addresses

PATCH New Jani Nikula 1 participant 3 messages Sep 30, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 dim: add more <> around Cc'd mailing list addresses

---
 dim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
dim +1 -1
index 3c340f05a759..2adbad375167 100755
@@ -1193,7 +1193,7 @@ function dim_fixes
 			# up to end of merge window, hence exclude if in -rc1
 			# through rc-4.
 			if ! git tag | grep ^v | sort -V | tail -n1 | grep -e "-rc[1-4]$" &> /dev/null ; then
-				echo Cc: [email protected]
+				echo "Cc: <[email protected]>"
 			fi
 		fi
 	fi
Signature · 6 lines
2.1.4

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

PATCH 2/3 dim: add dim cite subcommand

Add 'dim cite' subcommand to cite the supplied committish in format 'sha1 ("commit subject")'.

---
 dim     | 12 ++++++++++--
 dim.rst |  6 +++++-
 2 files changed, 15 insertions(+), 3 deletions(-)
dim +10 -2
index 2adbad375167..2b35e0ef69c9 100755
@@ -1169,13 +1169,21 @@ function dim_tc
 	fi
 }
 
+function dim_cite
+{
+	local sha1=$1
+	cd $DIM_PREFIX/$DIM_DRM_INTEL
+
+	git log -1 $sha1 "--pretty=format:%H (\"%s\")%n" | \
+		sed -e 's/\([0-f]\{12\}\)[0-f]*/\1/'
+}
+
 function dim_fixes
 {
 	cd $DIM_PREFIX/$DIM_DRM_INTEL
 	local sha1=$1
 
-	git log -1 $sha1 "--pretty=format:Fixes: %H (\"%s\")%n" | \
-		sed -e 's/\([0-f]\{12\}\)[0-f]*/\1/'
+	echo "Fixes: $(dim_cite $sha1)"
 
 	local tag=$(git tag --contains $1 | grep ^v | sort -V | head -n 1)
 	if [[ -n "$tag" ]]; then
dim.rst +5 -1
index 4a011f44b3ee..0b436f212539 100644
@@ -177,9 +177,13 @@ tc *commit-ish*
 Print the oldest Linux kernel release or -rc tag that contains the supplied
 *commit-ish*, or, if none do, print the upstream branches that contain it.
 
+cite *commit-ish*
+-----------------
+Cite the supplied *commit-ish* in format 'sha1 ("commit subject")'.
+
 fixes *commit-ish*
 ------------------
-Print the Fixes: line for the supplied *commit-ish* in the linux kernel
+Print the Fixes: and Cc: lines for the supplied *commit-ish* in the linux kernel
 CodingStyle approved format.
 
 check-patch|cp [*commit-ish* [.. *commit-ish*]]
Signature · 6 lines
2.1.4

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

PATCH 3/3 dim: have dim fixes print Cc's from commit being fixed first

In reply to Jani Nikula

The user can eyeball the list of Cc's while git churns through history to figure out whether the fix belongs in stable or not.

---
 dim | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
dim +5 -5
index 2b35e0ef69c9..126d79aea624 100755
@@ -1185,6 +1185,11 @@ function dim_fixes
 
 	echo "Fixes: $(dim_cite $sha1)"
 
+	git show --no-patch $sha1 | \
+		sed -e 's/\(Reviewed\|Acked\|Reported\|Signed\)[a-zA-Z-]*-by:/Cc:/' | \
+		sed -e 's/^    C[Cc]: */Cc: /' | grep '^Cc: ' | \
+		sort | uniq
+
 	local tag=$(git tag --contains $1 | grep ^v | sort -V | head -n 1)
 	if [[ -n "$tag" ]]; then
 		if echo "$tag" | grep -e "-rc" &> /dev/null ; then
@@ -1205,11 +1210,6 @@ function dim_fixes
 			fi
 		fi
 	fi
-
-	git show --no-patch $sha1 | \
-		sed -e 's/\(Reviewed\|Acked\|Reported\|Signed\)[a-zA-Z-]*-by:/Cc:/' | \
-		sed -e 's/^    C[Cc]: */Cc: /' | grep '^Cc: ' | \
-		sort | uniq
 }
 
 function dim_help
Signature · 6 lines
2.1.4

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