[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 2a8d2d5: * admin/gitmerge.el (gitmerge-skip-regexp)
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 2a8d2d5: * admin/gitmerge.el (gitmerge-skip-regexp): Be stricter in batch mode. |
Date: |
Mon, 18 Dec 2017 19:50:09 -0500 (EST) |
branch: master
commit 2a8d2d5daf55fe70ce3c07c0f0140835f952f56a
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
* admin/gitmerge.el (gitmerge-skip-regexp): Be stricter in batch mode.
---
admin/gitmerge.el | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index efb7d08..ba9f2b8 100644
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -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.")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 2a8d2d5: * admin/gitmerge.el (gitmerge-skip-regexp): Be stricter in batch mode.,
Glenn Morris <=