diff options
| author | Gordon Ross <gwr@racktopsystems.com> | 2022-02-10 11:01:48 -0500 |
|---|---|---|
| committer | Gordon Ross <gwr@racktopsystems.com> | 2022-03-15 11:08:56 -0400 |
| commit | c82c4676ac0cb87eb69c9444cf1a775e756ebbb9 (patch) | |
| tree | d7e5cc5de383d83d2030f6ef32eb4b7d14cc858c /usr/src | |
| parent | 77ac03cbec412857d39c4898c9ed10abb6061418 (diff) | |
| download | illumos-gate-c82c4676ac0cb87eb69c9444cf1a775e756ebbb9.tar.gz | |
14496 git pbchk should look in .git/info for *.NOT files
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Dan McDonald <danmcd@joyent.com>
Approved by: Robert Mustacchi <rm@fingolfin.org>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/tools/scripts/git-pbchk.1onbld | 10 | ||||
| -rw-r--r-- | usr/src/tools/scripts/git-pbchk.py | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/usr/src/tools/scripts/git-pbchk.1onbld b/usr/src/tools/scripts/git-pbchk.1onbld index 5876caef63..a25fb4aa90 100644 --- a/usr/src/tools/scripts/git-pbchk.1onbld +++ b/usr/src/tools/scripts/git-pbchk.1onbld @@ -15,7 +15,7 @@ .\" Copyright 2018 Joyent, Inc. .\" -.TH "GIT\-PBCHK" "1ONBLD" "September 4, 2018" "" "" +.TH "GIT\-PBCHK" "1ONBLD" "February 10, 2022" "" "" .SH "NAME" \fBgit\-pbchk\fR \- nits and pre\-putback checks for git @@ -52,13 +52,13 @@ Check that each source file contains a copyright notice for the current year\. You don't need to fix this if you, the potential new copyright holder, chooses not to .TP C style [cstyle] -Check that C source files conform to the Illumos C style rules +Check that C source files conform to the illumos C style rules .TP Header check [hdrchk] -Check that C header files conform to the Illumos header style rules (in addition to the general C rules) +Check that C header files conform to the illumos header style rules (in addition to the general C rules) .TP Java style [jstyle] -Check that Java source files conform to the Illumos Java style rules (which differ from the traditionally recommended Java style) +Check that Java source files conform to the illumos Java style rules (which differ from the traditionally recommended Java style) .TP SCCS Keywords [keywords] Check that no source files contain unexpanded SCCS keywords\. It is possible that this check may false positive on certain inputs\. It is generally obvious when this is the case\. @@ -77,7 +77,7 @@ Check for whitespace issues such as mixed tabs/spaces in source files. Exception lists can be used to exclude certain files from checking, named after the specific check. They can be found in \fB$CODEMGR_WS/exception_lists/\fR, or optionally under -\fB$CODEMGR_WS/\.git/\fR, where they must be suffixed \fB.NOT\fR. +\fB$CODEMGR_WS/\.git/info/\fR, where they must be suffixed \fB.NOT\fR. .IP "" 0 diff --git a/usr/src/tools/scripts/git-pbchk.py b/usr/src/tools/scripts/git-pbchk.py index 7f52749594..6f6c750648 100644 --- a/usr/src/tools/scripts/git-pbchk.py +++ b/usr/src/tools/scripts/git-pbchk.py @@ -172,7 +172,7 @@ def not_check(root, cmd): should be excluded from the check named by 'cmd'""" ignorefiles = list(filter(os.path.exists, - [os.path.join(root, ".git", "%s.NOT" % cmd), + [os.path.join(root, ".git/info", "%s.NOT" % cmd), os.path.join(root, "exception_lists", cmd)])) return Ignore.ignore(root, ignorefiles) |