From becc9e3c3f8b6df40f159eb01a89d5c7374fa23d Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sun, 29 Jun 2014 22:48:55 +0200 Subject: [PATCH] * vc/vc-git.el (vc-git-checkin): When operating on the whole tree pass "-a". --- lisp/ChangeLog | 5 +++++ lisp/vc/vc-git.el | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1a1f91b0e3d..b0648996b13 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-06-29 Andreas Schwab + + * vc/vc-git.el (vc-git-checkin): When operating on the whole tree + pass "-a". + 2014-06-29 Glenn Morris * cus-edit.el (help): diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index c7cae8359bf..9c8ab3ba393 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -674,7 +674,7 @@ It is based on `log-edit-mode', and has Git-specific extensions.") (cl-flet ((boolean-arg-fn (argument) (lambda (value) (when (equal value "yes") (list argument))))) - ;; When operating on the whole tree, better pass nil than ".", since "." + ;; When operating on the whole tree, better pass "-a" than ".", since "." ;; fails when we're committing a merge. (apply 'vc-git-command nil 0 (if only files) (nconc (list "commit" "-m") @@ -684,7 +684,7 @@ It is based on `log-edit-mode', and has Git-specific extensions.") ("Amend" . ,(boolean-arg-fn "--amend")) ("Sign-Off" . ,(boolean-arg-fn "--signoff"))) comment) - (if only (list "--only" "--"))))))) + (if only (list "--only" "--") '("-a"))))))) (defun vc-git-find-revision (file rev buffer) (let* (process-file-side-effects -- 2.39.5