undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git.el: Properly handle merge commits in git-amend-commit.

Browse Source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2008-08-02 18:05:58 +02:00
parent 6fb204266c
commit ef5133df7c
1 changed files with 9 additions and 8 deletions

17
contrib/emacs/git.el

@ -1235,11 +1235,10 @@ Return the list of files that haven't been handled."
(goto-char (point-max)) (goto-char (point-max))
(insert sign-off "\n")))) (insert sign-off "\n"))))
(defun git-setup-log-buffer (buffer &optional author-name author-email subject date msg) (defun git-setup-log-buffer (buffer &optional merge-heads author-name author-email subject date msg)
"Setup the log buffer for a commit." "Setup the log buffer for a commit."
(unless git-status (error "Not in git-status buffer.")) (unless git-status (error "Not in git-status buffer."))
(let ((merge-heads (git-get-merge-heads)) (let ((dir default-directory)
(dir default-directory)
(committer-name (git-get-committer-name)) (committer-name (git-get-committer-name))
(committer-email (git-get-committer-email)) (committer-email (git-get-committer-email))
(sign-off git-append-signed-off-by)) (sign-off git-append-signed-off-by))
@ -1294,7 +1293,7 @@ Return the list of files that haven't been handled."
(goto-char (point-min)) (goto-char (point-min))
(when (re-search-forward "^Date: \\(.*\\)$" nil t) (when (re-search-forward "^Date: \\(.*\\)$" nil t)
(setq date (match-string 1))))) (setq date (match-string 1)))))
(git-setup-log-buffer buffer author-name author-email subject date)) (git-setup-log-buffer buffer (git-get-merge-heads) author-name author-email subject date))
(if (boundp 'log-edit-diff-function) (if (boundp 'log-edit-diff-function)
(log-edit 'git-do-commit nil '((log-edit-listfun . git-log-edit-files) (log-edit 'git-do-commit nil '((log-edit-listfun . git-log-edit-files)
(log-edit-diff-function . git-log-edit-diff)) buffer) (log-edit-diff-function . git-log-edit-diff)) buffer)
@ -1305,11 +1304,13 @@ Return the list of files that haven't been handled."
(defun git-setup-commit-buffer (commit) (defun git-setup-commit-buffer (commit)
"Setup the commit buffer with the contents of COMMIT." "Setup the commit buffer with the contents of COMMIT."
(let (author-name author-email subject date msg) (let (parents author-name author-email subject date msg)
(with-temp-buffer (with-temp-buffer
(let ((coding-system (git-get-logoutput-coding-system))) (let ((coding-system (git-get-logoutput-coding-system)))
(git-call-process t "log" "-1" "--pretty=medium" commit) (git-call-process t "log" "-1" "--pretty=medium" "--abbrev=40" commit)
(goto-char (point-min)) (goto-char (point-min))
(when (re-search-forward "^Merge: *\\(.*\\)$" nil t)
(setq parents (cdr (split-string (match-string 1) " +"))))
(when (re-search-forward "^Author: *\\(.*\\) <\\(.*\\)>$" nil t) (when (re-search-forward "^Author: *\\(.*\\) <\\(.*\\)>$" nil t)
(setq author-name (match-string 1)) (setq author-name (match-string 1))
(setq author-email (match-string 2))) (setq author-email (match-string 2)))
@ -1321,14 +1322,14 @@ Return the list of files that haven't been handled."
(setq subject (pop msg)) (setq subject (pop msg))
(while (and msg (zerop (length (car msg))) (pop msg))))) (while (and msg (zerop (length (car msg))) (pop msg)))))
(git-setup-log-buffer (get-buffer-create "*git-commit*") (git-setup-log-buffer (get-buffer-create "*git-commit*")
author-name author-email subject date parents author-name author-email subject date
(mapconcat #'identity msg "\n")))) (mapconcat #'identity msg "\n"))))
(defun git-get-commit-files (commit) (defun git-get-commit-files (commit)
"Retrieve the list of files modified by COMMIT." "Retrieve the list of files modified by COMMIT."
(let (files) (let (files)
(with-temp-buffer (with-temp-buffer
(git-call-process t "diff-tree" "-r" "-z" "--name-only" "--no-commit-id" commit) (git-call-process t "diff-tree" "-m" "-r" "-z" "--name-only" "--no-commit-id" commit)
(goto-char (point-min)) (goto-char (point-min))
(while (re-search-forward "\\([^\0]*\\)\0" nil t 1) (while (re-search-forward "\\([^\0]*\\)\0" nil t 1)
(push (match-string 1) files))) (push (match-string 1) files)))