mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

Change do-not-merge pattern to "do not merge"

Browse source 
This should avoid the problem we recently had with
automatically-generated merge messages, while still letting people
specify commits not to merge.
* admin/gitmerge.el (gitmerge-skip-regexp): Add "do not merge".
(gitmerge-highlight-skip-regexp): Fold case when searching
for gitmerge-skip-regexp.
This commit is contained in:
Paul Eggert 2016-03-22 12:53:54 -07:00
parent 582962a3a1
commit b08237185e
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
admin/gitmerge.el
View file

@ -50,7 +50,7 @@
(defvar gitmerge-skip-regexp
;; We used to include "sync" in there, but in my experience it only
;; caused false positives. --Stef
"back[- ]?port\\|re-?generate\\|bump version\\|from trunk\\|\
"back[- ]?port\\|do not merge\\|re-?generate\\|bump version\\|from trunk\\|\
Auto-commit"
"Regexp matching logs of revisions that might be skipped.
`gitmerge-missing' will ask you if it should skip any matches.")
@ -171,9 +171,10 @@ Auto-commit"
(defun gitmerge-highlight-skip-regexp ()
"Highlight strings that match `gitmerge-skip-regexp'."
(save-excursion
(while (re-search-forward gitmerge-skip-regexp nil t)
(put-text-property (match-beginning 0) (match-end 0)
'face 'font-lock-warning-face))))
(let ((case-fold-search t))
(while (re-search-forward gitmerge-skip-regexp nil t)
(put-text-property (match-beginning 0) (match-end 0)
'face 'font-lock-warning-face)))))
(defun gitmerge-missing (from)
"Return the list of revisions that need to be merged from FROM.