[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master de88375: * admin/gitmerge.el: Tweaks that seemed ne
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] master de88375: * admin/gitmerge.el: Tweaks that seemed necessary |
Date: |
Sat, 26 Dec 2015 04:37:44 +0000 |
branch: master
commit de8837599112608feecea65a1e520866bc171569
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>
* admin/gitmerge.el: Tweaks that seemed necessary
* admin/gitmerge.el (gitmerge-skip-regexp): Remove "sync".
(gitmerge-maybe-resume): Provide explicit empty commit message.
---
admin/gitmerge.el | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index 1e92c8c..69e4d28 100644
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -48,7 +48,9 @@
(require 'smerge-mode)
(defvar gitmerge-skip-regexp
- "back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version\\|from trunk\\|\
+ ;; We used to include "sync" in there, but in my experience it only
+ ;; caused false positives. --Stef
+ "back[- ]?port\\|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.")
@@ -429,8 +431,14 @@ If so, add no longer conflicted files and commit."
(when mergehead
(with-current-buffer (get-buffer-create gitmerge-output-buffer)
(erase-buffer)
+ ;; FIXME: We add "-m-" because the default commit message
+ ;; apparently tickles our commit hook:
+ ;; Line longer than 78 characters in commit message
+ ;; Line longer than 78 characters in commit message
+ ;; Line longer than 78 characters in commit message
+ ;; Commit aborted; please see the file CONTRIBUTE
(unless (zerop (call-process "git" nil t nil
- "commit" "--no-edit"))
+ "commit" "--no-edit" "-m-"))
(error "Git error during merge - fix it manually"))))
;; Successfully resumed.
t))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master de88375: * admin/gitmerge.el: Tweaks that seemed necessary,
Stefan Monnier <=