From b08237185ec044c8afff0feb88a126512b33a6d8 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 22 Mar 2016 12:53:54 -0700 Subject: [PATCH] Change do-not-merge pattern to "do not merge" 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. --- admin/gitmerge.el | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/admin/gitmerge.el b/admin/gitmerge.el index ed876436356..a07f57a6008 100644 --- a/admin/gitmerge.el +++ b/admin/gitmerge.el @@ -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. -- 2.39.2