{"thread":{"id":"43685","subject":"[PATCH 4/4] git.el: Include MERGE_MSG in the log-edit buffer even when not committing a merge.","startedAt":"2006-11-03T16:42:43Z","lastAt":"2006-11-03T16:42:43Z","messageCount":1,"participants":["Alexandre Julliard"],"isPatch":true,"patchVersion":1,"patchTotal":4},"messages":[{"id":"296658","messageId":"87zmb81ny4.fsf@wine.dyndns.org","threadId":"43685","inReplyTo":null,"subject":"[PATCH 4/4] git.el: Include MERGE_MSG in the log-edit buffer even when not committing a merge.","fromName":"Alexandre Julliard","fromEmail":"julliard@winehq.org","sentAt":"2006-11-03T16:42:43Z","receivedAt":"2006-11-03T16:42:43Z","isPatch":true,"sender":{"key":"julliard@winehq.org","avatar":null},"body":"This lets us take advantage of the fact that git-cherry-pick now saves\nthe message in MERGE_MSG too.\n\nSigned-off-by: Alexandre Julliard <julliard@winehq.org>\n---\n contrib/emacs/git.el |    3 ++-\n 1 files changed, 2 insertions(+), 1 deletions(-)\n\ndiff --git a/contrib/emacs/git.el b/contrib/emacs/git.el\nindex 6f3b46d..972c402 100644\n--- a/contrib/emacs/git.el\n+++ b/contrib/emacs/git.el\n@@ -589,6 +589,7 @@ and returns the process output as a stri\n                           (let ((commit (git-commit-tree buffer tree head)))\n                             (git-update-ref \"HEAD\" commit head)\n                             (condition-case nil (delete-file \".git/MERGE_HEAD\") (error nil))\n+                            (condition-case nil (delete-file \".git/MERGE_MSG\") (error nil))\n                             (with-current-buffer buffer (erase-buffer))\n                             (git-set-files-state files 'uptodate)\n                             (when (file-directory-p \".git/rr-cache\")\n@@ -888,7 +889,7 @@ and returns the process output as a stri\n           'face 'git-header-face)\n          (propertize git-log-msg-separator 'face 'git-separator-face)\n          \"\\n\")\n-        (cond ((and merge-heads (file-readable-p \".git/MERGE_MSG\"))\n+        (cond ((file-readable-p \".git/MERGE_MSG\")\n                (insert-file-contents \".git/MERGE_MSG\"))\n               (sign-off\n                (insert (format \"\\n\\nSigned-off-by: %s <%s>\\n\"\n-- \n1.4.3.3.gf3240\n\n-- \nAlexandre Julliard\n"}]}