diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-04-18 19:08:53 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-04-18 19:48:23 -0700 |
| commit | f2da220b5fde8575812784f6a9e5f7df9560e838 (patch) | |
| tree | 382142ae10ef2aa258e6579f5050854d7eda326b | |
| parent | f4f1380deac296fb6ece142b16bf0ae2f3bdbd4d (diff) | |
| download | emacs-f2da220b5fde8575812784f6a9e5f7df9560e838.tar.gz | |
Prefer "Bug#1234" in commit messages
* .dir-locals.el (log-edit-mode): Don't rewrite Bug#,
as this isn't useful for Git.
* CONTRIBUTE: Suggest "Bug#1234" instead of "Fixes: debbugs:1234".
| -rw-r--r-- | .dir-locals.el | 4 | ||||
| -rw-r--r-- | CONTRIBUTE | 11 |
2 files changed, 5 insertions, 10 deletions
diff --git a/.dir-locals.el b/.dir-locals.el index f899b5155d6..9853d7b5d88 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -3,9 +3,7 @@ (fill-column . 70))) (c-mode . ((c-file-style . "GNU"))) (objc-mode . ((c-file-style . "GNU"))) - (log-edit-mode . ((log-edit-rewrite-fixes - "[ \n](bug#\\([0-9]+\\))" . "debbugs:\\1") - (log-edit-font-lock-gnu-style . t) + (log-edit-mode . ((log-edit-font-lock-gnu-style . t) (log-edit-setup-add-author . t))) (change-log-mode . ((add-log-time-zone-rule . t) (fill-column . 74) diff --git a/CONTRIBUTE b/CONTRIBUTE index 476b3610cd5..4205bc3990a 100644 --- a/CONTRIBUTE +++ b/CONTRIBUTE @@ -42,12 +42,11 @@ in its message. Here is an example commit message (indented): Deactivate shifted region Do not silently extend a region that is not highlighted; - this can happen after a shift. + this can happen after a shift (Bug#19003). * doc/emacs/mark.texi (Shift Selection): Document the change. * lisp/window.el (handle-select-window): * src/frame.c (Fhandle_switch_frame, Fselected_frame): Deactivate the mark. - Fixes: bug#19003 The general format is as follows. @@ -113,11 +112,9 @@ The general format is as follows. Copyright-paperwork-exempt: yes -- If the commit fixes a bug, append a separate line - - Fixes: bug#NNNN - - where NNNN is the bug number. +- The commit message should contain "Bug#NNNNN" if it is related to + bug number NNNNN in the debbugs database. This string is often + parenthesized, as in "(Bug#19003)". - In ChangeLog entries, there is no standard or recommended way to identify revisions. |