procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* admin/gitmerge.el (gitmerge-skip-regexp): Be stricter in batch mode.

Browse source
This commit is contained in:
Glenn Morris 2017-12-18 19:49:51 -05:00
parent 1e89864f92
commit 2a8d2d5daf
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
admin/gitmerge.el
View file

@ -50,8 +50,16 @@
(defvar gitmerge-skip-regexp
;; We used to include "sync" in there, but in my experience it only
;; caused false positives. --Stef
"back[- ]?port\\|cherry picked from commit\\|\\(do\\( no\\|n['’]\\)t\\|no need to\\) merge\\|\
re-?generate\\|bump version\\|from trunk\\|Auto-commit"
(let ((skip "back[- ]?port\\|cherry picked from commit\\|\
\\(do\\( no\\|n['’]\\)t\\|no need to\\) merge\\|\
bump version\\|Auto-commit"))
(if noninteractive skip
;; "Regenerate" is quite prone to false positives.
;; We only want to skip merging things like AUTHORS and ldefs-boot.
;; These should be covered by "bump version" and "auto-commit".
;; It doesn't do much harm if we merge one of those files by mistake.
;; So it's better to err on the side of false negatives.
(concat skip "\\|re-?generate\\|from trunk")))
"Regexp matching logs of revisions that might be skipped.
`gitmerge-missing' will ask you if it should skip any matches.")