From b37041ae37104a3d7d85e4c14de490032cdcd666 Mon Sep 17 00:00:00 2001 From: Benjamin Lindqvist Date: Thu, 11 Jul 2019 07:23:38 +0200 Subject: Enable getting git branch w/o magit Force push fix for removing newline --- feebleline.el | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/feebleline.el b/feebleline.el index eea9a09..9e16c2e 100644 --- a/feebleline.el +++ b/feebleline.el @@ -63,8 +63,12 @@ (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"))) + (string-trim (replace-regexp-in-string + "^HEAD" "(detached HEAD)" + branch))))) (defcustom feebleline-msg-functions '((feebleline-line-number :post "" :fmt "%5s") -- cgit v1.2.3 From 71f2b021af6924af4744f556a0472aa0d95c5f3b Mon Sep 17 00:00:00 2001 From: Benjamin Lindqvist Date: Thu, 22 Aug 2019 15:44:44 +0200 Subject: Ignore stderr when getting git branch --- feebleline.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/feebleline.el b/feebleline.el index 9e16c2e..039d327 100644 --- a/feebleline.el +++ b/feebleline.el @@ -65,10 +65,11 @@ (if (and (buffer-file-name) (file-remote-p (buffer-file-name))) "" (let ((branch (shell-command-to-string - "git rev-parse --symbolic-full-name --abbrev-ref HEAD"))) + "git rev-parse --symbolic-full-name --abbrev-ref HEAD 2>/dev/null"))) (string-trim (replace-regexp-in-string "^HEAD" "(detached HEAD)" - branch))))) + branch))) + )) (defcustom feebleline-msg-functions '((feebleline-line-number :post "" :fmt "%5s") -- cgit v1.2.3