git.el: Include MERGE_MSG in the log-edit buffer even when not committing a merge.
This lets us take advantage of the fact that git-cherry-pick now saves the message in MERGE_MSG too. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Alexandre Julliard committed
Nov 3, 2006 at 17:42 UTC
2379d61fa6355bc7a8cc8b5dce87a7d4a9505c76
1 file changed
+2
-1
contrib/emacs/git.el
+2
-1
@@ -589,6 +589,7 @@ and returns the process output as a string."
589
(let ((commit (git-commit-tree buffer tree head)))
590
(git-update-ref "HEAD" commit head)
591
(condition-case nil (delete-file ".git/MERGE_HEAD") (error nil))
592
+ (condition-case nil (delete-file ".git/MERGE_MSG") (error nil))
593
(with-current-buffer buffer (erase-buffer))
594
(git-set-files-state files 'uptodate)
595
(when (file-directory-p ".git/rr-cache")
@@ -888,7 +889,7 @@ and returns the process output as a string."
889
'face 'git-header-face)
890
(propertize git-log-msg-separator 'face 'git-separator-face)
891
"\n")
891
- (cond ((and merge-heads (file-readable-p ".git/MERGE_MSG"))
892
+ (cond ((file-readable-p ".git/MERGE_MSG")
893
(insert-file-contents ".git/MERGE_MSG"))
894
(sign-off
895
(insert (format "\n\nSigned-off-by: %s <%s>\n"