emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge: pull request #5708 from iyefrat/lint-commits-fixes

Browse source 
Fix commit linter bugs
This commit is contained in:
Henrik Lissner 2021-11-04 00:59:28 +01:00 • committed by GitHub
commit 05edc70827
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/cli/ci.el
View file

@ -48,7 +48,7 @@ Accapted value types can be one or more of ref, hash, url, username, or name.")
'((ref . "^\\(https?://[^ ]+\\|[^/]+/[^/]+\\)?#[0-9]+$") '((ref . "^\\(https?://[^ ]+\\|[^/]+/[^/]+\\)?#[0-9]+$")
(hash . "^\\(https?://[^ ]+\\|[^/]+/[^/]+@\\)?[a-z0-9]\\{12\\}$") (hash . "^\\(https?://[^ ]+\\|[^/]+/[^/]+@\\)?[a-z0-9]\\{12\\}$")
(url . "^https?://") (url . "^https?://")
(name . "^[a-zA-Z0-9-_ ]+<[^@]+@[^.]+\\.[^>]+>$") (name . "^[a-zA-Z0-9-_ \\.]+<[^@]+@[^.]+\\.[^>]+>$")
(username . "^@[^a-zA-Z0-9_-]+$")) (username . "^@[^a-zA-Z0-9_-]+$"))
"An alist of valid trailer keys and their accepted value types. "An alist of valid trailer keys and their accepted value types.
@ -219,7 +219,8 @@ representing the current commit being checked against. See
(truncate-string-to-width (string-trim line) 16 nil nil "…") (truncate-string-to-width (string-trim line) 16 nil nil "…")
(match-string 1 line)))) (match-string 1 line))))
(pcase-dolist (`(,key . ,value) trailers) (pcase-dolist (`(,key . ,value) trailers)
(if (string-match-p " " value) (if (and (not (memq 'name (cdr (assoc key doom-cli-commit-trailer-keys))))
(string-match-p " " value))
(fail! "Found %S, but only one value allowed per trailer" (fail! "Found %S, but only one value allowed per trailer"
(truncate-string-to-width (concat key ": " value) 20 nil nil "…")) (truncate-string-to-width (concat key ": " value) 20 nil nil "…"))
(when-let (allowed-types (cdr (assoc key doom-cli-commit-trailer-keys))) (when-let (allowed-types (cdr (assoc key doom-cli-commit-trailer-keys)))