* lisp/xgit-core.el (xgit-log-edit-file-name): Change to COMMIT_EDITMSG to match what git commit uses when no commit message is provided.
* lisp/xgit-dvc.el (xgit-dvc-log-edit-file-name-func): Place the log-edit file in the .git directory, not the working directory, so that it is out of the way. --- Committed revision 7274caf1c3040274b68615b6e718f6511eea0234 to <git://git.hcoop.net/git/mwolson/emacs/dvc.git>. lisp/xgit-core.el | 6 +++--- lisp/xgit-dvc.el | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lisp/xgit-core.el b/lisp/xgit-core.el index 595dccf..3390677 100644 --- a/lisp/xgit-core.el +++ b/lisp/xgit-core.el @@ -54,9 +54,9 @@ git metadata directory." :group 'dvc-xgit) (defvar xgit-log-edit-file-name - "++xgit-log-edit" - "The filename, used to store the log message before commiting. -Usually that file is placed in the tree-root of the working tree.") + "COMMIT_EDITMSG" + "The filename used to store the log message before commiting. +Usually that file is placed in the .git directory of the working tree.") (defun xgit-lookup-external-git-dir (&optional location root) "Check to see whether the user has specified a custom git metadata diff --git a/lisp/xgit-dvc.el b/lisp/xgit-dvc.el index 8baecff..783a21e 100644 --- a/lisp/xgit-dvc.el +++ b/lisp/xgit-dvc.el @@ -45,7 +45,12 @@ (defalias 'xgit-dvc-delta 'xgit-delta) (defun xgit-dvc-log-edit-file-name-func () - (concat (xgit-tree-root) xgit-log-edit-file-name)) + (let ((git-dir (xgit-lookup-external-git-dir))) + (when git-dir + (setq git-dir (file-name-as-directory git-dir))) + (concat (or git-dir (xgit-tree-root)) + (if git-dir "" ".git") + "/" xgit-log-edit-file-name))) (defun xgit-dvc-log-edit-done (&optional invert-normal) "Finish a commit for git, using git commit. -- 1.5.4.3 -- | Michael Olson | FSF Associate Member #652 | | http://mwolson.org/ | Hobbies: Lisp, HCoop | | Projects: Emacs, Muse, ERC, EMMS, ErBot, DVC, Planner | `-------------------------------------------------------' _______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
