Meta/Announce: use mailmap and tweak wording for maintenance tracks
Junio C Hamano committed
Jun 24, 2015 at 11:17 UTC
47d4766efc6ddd3b2ee091e381167fe44d72d4e4
1 file changed
+41
-16
Announce
+41
-16
@@ -42,8 +42,8 @@ esac
42
43
vername=$(echo "$vername" | tr "-" ".")
44
45
-git log --format='%aN,' "$previous" | sort -u >"$tmpbase.prev"
46
-git log --format='%aN,' "$previous..$commit" | sort -u >"$tmpbase.this"
45
+git log --use-mailmap --format='%aN,' "$previous" | sort -u >"$tmpbase.prev"
46
+git log --use-mailmap --format='%aN,' "$previous..$commit" | sort -u >"$tmpbase.this"
47
comm -12 "$tmpbase.prev" "$tmpbase.this" >"$tmpbase.old"
48
comm -13 "$tmpbase.prev" "$tmpbase.this" >"$tmpbase.new"
49
@@ -59,11 +59,16 @@ Subject: [ANNOUNCE] Git $relname
59
60
EOF
61
62
-fmt -68 <<EOF
63
-$kind Git $relname is now available$for_testing at the usual places.
64
-It is comprised of $cnt non-merge commits since $previous,
65
-contributed by $all people, $new of which are new faces.
66
-EOF
62
+(
63
+ echo "$kind Git $relname is now available$for_testing at the usual places."
64
+ if test "$branch" = master
65
+ then
66
+ cat <<-EOF
67
+ It is comprised of $cnt non-merge commits since $previous,
68
+ contributed by $all people, $new of which are new faces.
69
+ EOF
70
+ fi
71
+) | fmt -68
72
73
cat <<EOF
74
@@ -71,8 +76,22 @@ The tarballs are found at:
76
77
https://www.kernel.org/pub/software/scm/git/${for_testing:+testing/}
78
74
-The following public repositories all have a copy of the '$relname'
75
-tag and the '$branch' branch that the tag points at:
79
+EOF
80
+
81
+(
82
+ cat <<-EOF
83
+ The following public repositories all have a copy of
84
+ the '$relname' tag and
85
+ EOF
86
+ case "$branch" in
87
+ maint-* | mainto/*)
88
+ echo "some of them have"
89
+ ;;
90
+ esac
91
+ echo "the '$branch' branch that the tag points at:"
92
+) | fmt -68
93
+
94
+cat <<\EOF
95
96
url = https://kernel.googlesource.com/pub/scm/git/git
97
url = git://repo.or.cz/alt-git.git
@@ -94,17 +113,23 @@ fmt_people () {
113
114
}
115
97
-cat <<EOF
116
+if test "$branch" = master
117
+then
118
+ cat <<-EOF
119
99
-New contributors whose contributions weren't in $previous are as follows.
100
-Welcome to the Git development community!
120
+ New contributors whose contributions weren't in $previous are as follows.
121
+ Welcome to the Git development community!
122
102
-$(fmt_people "$tmpbase.new")
123
+ $(fmt_people "$tmpbase.new")
124
104
-Returning contributors who helped this release are as follows.
105
-Thanks for your continued support.
125
+ Returning contributors who helped this release are as follows.
126
+ Thanks for your continued support.
127
107
-$(fmt_people "$tmpbase.old")
128
+ $(fmt_people "$tmpbase.old")
129
+ EOF
130
+fi
131
+
132
+cat <<EOF
133
134
----------------------------------------------------------------
135