summaryrefslogtreecommitdiffstats
path: root/lisp/init-git.el
diff options
context:
space:
mode:
authorMartin Polden <martin.polden@gmail.com>2014-07-17 19:33:54 +0200
committerMartin Polden <martin.polden@gmail.com>2014-07-17 19:43:26 +0200
commit5cc786af5dad12c67cadff18276a2fdd398f705d (patch)
tree04ff875b1a14f07af9506970c48001ebeda0f7c8 /lisp/init-git.el
parentff02f85b7765ec3258d63c727e4c213a43fe6d8b (diff)
Use magit function for finding git top directory
Diffstat (limited to 'lisp/init-git.el')
-rw-r--r--lisp/init-git.el15
1 files changed, 2 insertions, 13 deletions
diff --git a/lisp/init-git.el b/lisp/init-git.el
index e2b4378..3f7da65 100644
--- a/lisp/init-git.el
+++ b/lisp/init-git.el
@@ -39,17 +39,6 @@
(goto-char (point-min))
(forward-line (1- current-line)))))
-(defun git-locate-root ()
- "Find Git repository of the current buffer. Returns nil if no repo is found."
- (if buffer-file-name
- (let ((git-root (vc-git-root buffer-file-name)))
- (or git-root
- (progn
- (message "%s is not in a git repository" buffer-file-name)
- nil)))
- (message "Buffer is not visiting a file.")
- nil))
-
(add-hook 'magit-status-mode-hook
(lambda ()
;; make C-o and o behave as in dired
@@ -64,7 +53,7 @@
(defun git-root ()
"Find the git repository root of the visiting file."
(interactive)
- (let ((git-root-path (git-locate-root)))
+ (let ((git-root-path (magit-get-top-dir)))
(when git-root-path
(let ((git-root-file-name (directory-file-name git-root-path)))
(message "git repository: %s (%s)"
@@ -77,7 +66,7 @@
(defun git-grep-root ()
"Run git-grep in the repository root."
(interactive)
- (let ((git-root-path (git-locate-root)))
+ (let ((git-root-path (magit-get-top-dir)))
(when git-root-path
(vc-git-grep (grep-read-regexp) "*" git-root-path))))