git: 713410cb2c - main - Update advisory templates for Git

[Ed Maste]

The branch main has been updated by emaste (src committer):

URL: https://cgit.FreeBSD.org/doc/commit/?id=713410cb2ca0a7dcdfd00fab203a16a0515b596f

commit 713410cb2ca0a7dcdfd00fab203a16a0515b596f
Author:     Ed Maste <emaste at FreeBSD.org>
AuthorDate: 2021-04-06 13:58:58 +0000
Commit:     Ed Maste <emaste at FreeBSD.org>
CommitDate: 2021-04-06 15:32:13 +0000

    Update advisory templates for Git
    
    Reviewed by:    gjb, markj
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D29596
---
 website/static/security/advisory-template.txt | 29 +++++++++++++++++++++------
 website/static/security/errata-template.txt   | 29 +++++++++++++++++++--------
 2 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/website/static/security/advisory-template.txt b/website/static/security/advisory-template.txt
index 71c4b4372a..6eb6edb6ef 100644
--- a/website/static/security/advisory-template.txt
+++ b/website/static/security/advisory-template.txt
@@ -114,19 +114,36 @@ VI.  Correction details
 The following list contains the correction revision numbers for each
 affected branch.
 
-Branch/path                                                      Revision
+Branch/path                             Hash                     Revision
 -------------------------------------------------------------------------
-stable/13/                                                        rXXXXXX
-releng/13.0/                                                      rXXXXXX
+stable/13/                              XXXXXXXXXXXX    stable/13-nXXXXXX
+releng/13.0/                            XXXXXXXXXXXX  releng/13.0-nXXXXXX
 stable/12/                                                        rXXXXXX
 releng/12.2/                                                      rXXXXXX
 stable/11/                                                        rXXXXXX
 releng/11.4/                                                      rXXXXXX
 -------------------------------------------------------------------------
 
-To see which files were modified by a particular revision, run the
-following command, replacing NNNNNN with the revision number, on a
-machine with Subversion installed:
+For FreeBSD 13 and later:
+
+Run the following command to see which files were modified by a
+particular commit:
+
+# git show --stat <commit hash>
+
+Or visit the following URL, replacing XXXXXX with the hash:
+
+<URL:https://cgit.freebsd.org/src/commit/?id=XXXXXX>
+
+To determine the commit count in a working tree (for comparison against
+nNNNNNN in the table above), run:
+
+# git rev-list --count --first-parent HEAD
+
+For FreeBSD 12 and earlier:
+
+Run the following command to see which files were modified by a particular
+revision, replacing NNNNNN with the revision number:
 
 # svn diff -cNNNNNN --summarize svn://svn.freebsd.org/base
 
diff --git a/website/static/security/errata-template.txt b/website/static/security/errata-template.txt
index 9d78362e6d..06433c318e 100644
--- a/website/static/security/errata-template.txt
+++ b/website/static/security/errata-template.txt
@@ -114,23 +114,36 @@ VI.  Correction details
 The following list contains the correction revision numbers for each
 affected branch.
 
-Branch/path                                                      Revision
+Branch/path                             Hash                     Revision
 -------------------------------------------------------------------------
-stable/13/                                                        rXXXXXX
-releng/13.0/                                                      rXXXXXX
+stable/13/                              XXXXXXXXXXXX    stable/13-nXXXXXX
+releng/13.0/                            XXXXXXXXXXXX  releng/13.0-nXXXXXX
 stable/12/                                                        rXXXXXX
 releng/12.2/                                                      rXXXXXX
 stable/11/                                                        rXXXXXX
 releng/11.4/                                                      rXXXXXX
 -------------------------------------------------------------------------
 
-To see which files were modified by a particular revision, run the
-following command, replacing NNNNNN with the revision number, on a
-machine with Subversion installed:
+For FreeBSD 13 and later:
 
-# svn diff -cNNNNNN --summarize svn://svn.freebsd.org/base
+Run the following command to see which files were modified by a
+particular commit:
 
-Or visit the following URL, replacing NNNNNN with the revision number:
+# git show --stat <commit hash>
+
+Or visit the following URL, replacing XXXXXX with the hash:
+
+<URL:https://cgit.freebsd.org/src/commit/?id=XXXXXX>
+
+To determine the commit count in a working tree (for comparison against
+nNNNNNN in the table above), run:
+
+# git rev-list --count --first-parent HEAD
+
+For FreeBSD 12 and earlier:
+
+Run the following command to see which files were modified by a particular
+revision, replacing NNNNNN with the revision number:
 
 <URL:https://svnweb.freebsd.org/base?view=revision&revision=NNNNNN>