From 85aff4de30686359ffb50845eb0930c0a18dc8ba Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 22 Oct 2022 14:05:44 +0200 Subject: snippets: Harden for review activity. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When reviewing patches, whose commit logs don't follow the structure outlined in “Submitting Patches”, a reviewer might be tempted to use snippets to rewrite them. This makes it so that their attempt, while not immediately succeeding, isn't completely thwarted. * etc/snippets/tempel/text-mode (add\ , remove\ , rename\ , update\ ) (addcl\ , https\ ): Use an empty "p" field if (car (magit-staged-files)) fails. --- etc/snippets/tempel/text-mode | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'etc/snippets') diff --git a/etc/snippets/tempel/text-mode b/etc/snippets/tempel/text-mode index 364c21266d..fd0e95eaa6 100644 --- a/etc/snippets/tempel/text-mode +++ b/etc/snippets/tempel/text-mode @@ -12,7 +12,8 @@ text-mode :when (and (fboundp 'git-commit-mode) (git-commit-mode)) (match-string-no-properties 1))) var) "." n n - "* " (car (magit-staged-files)) " (" (s var ) "): New variable.") + "* " (p (or (car (magit-staged-files)) "")) + " (" (s var ) "): New variable.") (remove\ "gnu: Remove " (p (with-temp-buffer @@ -24,7 +25,8 @@ text-mode :when (and (fboundp 'git-commit-mode) (git-commit-mode)) (match-string-no-properties 1))) var) "." n n - "* " (car (magit-staged-files)) " (" (s var) "): Delete variable.") + "* " (p (or (car (magit-staged-files)) "")) + " (" (s var) "): Delete variable.") (rename\ "gnu: " (p (with-temp-buffer @@ -43,7 +45,7 @@ text-mode :when (and (fboundp 'git-commit-mode) (git-commit-mode)) (thing-at-point 'sexp 'no-properties))) new-var) "." n n - "* " (car (magit-staged-files)) " (" (s prev-var) "): " + "* " (p (or (car (magit-staged-files)) "")) " (" (s prev-var) "): " "Define in terms of" n "'deprecated-package'." n "(" (s new-var) "): New variable, formerly known as \"" @@ -74,7 +76,7 @@ text-mode :when (and (fboundp 'git-commit-mode) (git-commit-mode)) (buffer-substring-no-properties (point) (- end 2)))))) version) "." n n - "* " (car (magit-staged-files)) " (" (s var) "): " + "* " (p (or (car (magit-staged-files)) "")) " (" (s var) "): " "Update to " (s version) "." n (mapconcat (lambda (file) (concat "* " file)) (cdr (magit-staged-files)) @@ -92,7 +94,7 @@ text-mode :when (and (fboundp 'git-commit-mode) (git-commit-mode)) (thing-at-point 'sexp 'no-properties))))) var) "." n n - "* " (car (magit-staged-files)) + "* " (p (or (car (magit-staged-files)) "")) " (cl-" (s var) ", ecl-" (s var) ", sbcl-" (s var) "): New variables.") @@ -107,7 +109,8 @@ text-mode :when (and (fboundp 'git-commit-mode) (git-commit-mode)) (match-string-no-properties 1))) var) ": Use HTTPS home page." n n - "* " (car (magit-staged-files)) " (" (s var) ")[home-page]: Use HTTPS." + "* " (p (or (car (magit-staged-files)) "")) + " (" (s var) ")[home-page]: Use HTTPS." n (mapconcat (lambda (file) (concat "* " file)) (cdr (magit-staged-files)) -- cgit v1.2.3