Skip to content

Commit 7fe48cb

Browse files
committed
Merge branch 'tg/doc-sec-list'
Doc update. * tg/doc-sec-list: note [email protected] in more places SubmittingPatches: replace numbered attributes with names
2 parents c45505d + 2a00502 commit 7fe48cb

File tree

2 files changed

+20
-4
lines changed

2 files changed

+20
-4
lines changed

Documentation/SubmittingPatches

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,12 @@ that is fine, but please mark it as such.
176176
[[send-patches]]
177177
=== Sending your patches.
178178

179+
:security-ml: footnoteref:[security-ml,The Git Security mailing list: [email protected]]
180+
181+
Before sending any patches, please note that patches that may be
182+
security relevant should be submitted privately to the Git Security
183+
mailing list{security-ml}, instead of the public mailing list.
184+
179185
Learn to use format-patch and send-email if possible. These commands
180186
are optimized for the workflow of sending patches, avoiding many ways
181187
your existing e-mail client that is optimized for "multipart/*" mime
@@ -259,17 +265,24 @@ patch, format it as "multipart/signed", not a text/plain message
259265
that starts with `-----BEGIN PGP SIGNED MESSAGE-----`. That is
260266
not a text/plain, it's something else.
261267

268+
:security-ml-ref: footnoteref:[security-ml]
269+
270+
As mentioned at the beginning of the section, patches that may be
271+
security relevant should not be submitted to the public mailing list
272+
mentioned below, but should instead be sent privately to the Git
273+
Security mailing list{security-ml-ref}.
274+
262275
Send your patch with "To:" set to the mailing list, with "cc:" listing
263276
people who are involved in the area you are touching (the `git
264277
contacts` command in `contrib/contacts/` can help to
265278
identify them), to solicit comments and reviews.
266279

267-
:1: footnote:[The current maintainer: [email protected]]
268-
:2: footnote:[The mailing list: [email protected]]
280+
:current-maintainer: footnote:[The current maintainer: [email protected]]
281+
:git-ml: footnote:[The mailing list: [email protected]]
269282

270283
After the list reached a consensus that it is a good idea to apply the
271-
patch, re-send it with "To:" set to the maintainer{1} and "cc:" the
272-
list{2} for inclusion.
284+
patch, re-send it with "To:" set to the maintainer{current-maintainer} and "cc:" the
285+
list{git-ml} for inclusion.
273286

274287
Do not forget to add trailers such as `Acked-by:`, `Reviewed-by:` and
275288
`Tested-by:` lines as necessary to credit people who helped your

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ the body to [email protected]. The mailing list archives are
3636
available at <https://public-inbox.org/git/>,
3737
<http://marc.info/?l=git> and other archival sites.
3838

39+
Issues which are security relevant should be disclosed privately to
40+
the Git Security mailing list <[email protected]>.
41+
3942
The maintainer frequently sends the "What's cooking" reports that
4043
list the current status of various development topics to the mailing
4144
list. The discussion following them give a good reference for

0 commit comments

Comments
 (0)