mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-20 18:17:20 +00:00
Code Issues Releases Activity

* admin/gitmerge.el: Tweaks that seemed necessary

Browse Source 
* admin/gitmerge.el (gitmerge-skip-regexp): Remove "sync".
(gitmerge-maybe-resume): Provide explicit empty commit message.
This commit is contained in:
Stefan Monnier 2015-12-25 23:37:36 -05:00
parent 5917b50487
commit de88375991
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

@ -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))))