Mercurial > emacs
changeset 105593:1987d1800365
(vc-git-dir-extra-headers): Set the branch name
correctly in the detached head case.
(vc-git-print-log): Remove unused binding.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Wed, 14 Oct 2009 06:28:00 +0000 |
| parents | 7460402f0b1a |
| children | 93081d78d55b |
| files | lisp/ChangeLog lisp/vc-git.el |
| diffstat | 2 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Oct 14 06:10:19 2009 +0000 +++ b/lisp/ChangeLog Wed Oct 14 06:28:00 2009 +0000 @@ -1,5 +1,9 @@ 2009-10-14 Dan Nicolaescu <dann@ics.uci.edu> + * vc-git.el (vc-git-dir-extra-headers): Set the branch name + correctly in the detached head case. + (vc-git-print-log): Remove unused binding. + * vc.el (vc-responsible-backend): When a directory is passed for for registration create a VC repository if no backend is responsible for the directory argument.
--- a/lisp/vc-git.el Wed Oct 14 06:10:19 2009 +0000 +++ b/lisp/vc-git.el Wed Oct 14 06:28:00 2009 +0000 @@ -421,7 +421,7 @@ (vc-git--out-ok "config" (concat "remote." remote ".url")))))) (when (string-match "\\([^\n]+\\)" remote-url) (setq remote-url (match-string 1 remote-url)))) - "not (detached HEAD)") + (setq branch "not (detached HEAD)")) ;; FIXME: maybe use a different face when nothing is stashed. (concat (propertize "Branch : " 'face 'font-lock-type-face) @@ -503,10 +503,7 @@ (defun vc-git-print-log (files &optional buffer shortlog) "Get change log associated with FILES." - (let ((coding-system-for-read git-commits-coding-system) - ;; Support both the old print-log interface that passes a - ;; single file, and the new one that passes a file list. - (flist (if (listp files) files (list files)))) + (let ((coding-system-for-read git-commits-coding-system)) ;; `vc-do-command' creates the buffer, but we need it before running ;; the command. (vc-setup-buffer buffer)