Problem reported by David Engster in:
http://lists.gnu.org/archive/html/emacs-devel/2016-03/msg01270.html
* admin/gitmerge.el (gitmerge-commit-message):
Truncate the computed commit message to at most 72 characters per line.
(gitmerge-maybe-resume): Don’t use "-" as the commit message for
merges; use the computed commit message instead.
(if end (list (concat beg "~.." end))
`("-1" ,beg)))
(insert "\n")
(if end (list (concat beg "~.." end))
`("-1" ,beg)))
(insert "\n")
+ ;; Truncate to 72 chars so that the resulting ChangeLog line fits in 80.
+ (goto-char (point-min))
+ (while (re-search-forward "^\\(.\\{69\\}\\).\\{4,\\}" nil t)
+ (replace-match "\\1..."))
(buffer-string)))
(defun gitmerge-apply (missing from)
(buffer-string)))
(defun gitmerge-apply (missing from)
(when mergehead
(with-current-buffer (get-buffer-create gitmerge-output-buffer)
(erase-buffer)
(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
(unless (zerop (call-process "git" nil t nil
- "commit" "--no-edit" "-m-"))
(error "Git error during merge - fix it manually"))))
;; Successfully resumed.
t))))
(error "Git error during merge - fix it manually"))))
;; Successfully resumed.
t))))