Merge pull request #43 from tautologyclub/development

Enable getting git branch w/o magit

1 files changed, 7 insertions, 2 deletions

diff --git a/feebleline.el b/feebleline.el
index eea9a09..039d327 100644
--- a/feebleline.el
+++ b/feebleline.el
@@ -63,8 +63,13 @@
 (defun feebleline-git-branch ()
   "Return current git branch, unless file is remote."
   (if (and (buffer-file-name) (file-remote-p (buffer-file-name)))
-      "-"
-    (magit-get-current-branch)))
+      ""
+    (let ((branch (shell-command-to-string
+                   "git rev-parse --symbolic-full-name --abbrev-ref HEAD 2>/dev/null")))
+      (string-trim (replace-regexp-in-string
+                    "^HEAD" "(detached HEAD)"
+                    branch)))
+    ))
 
 (defcustom feebleline-msg-functions
   '((feebleline-line-number         :post "" :fmt "%5s")