From 5de836b382f66272e5f9bca32ea102492bdecb17 Mon Sep 17 00:00:00 2001 From: Felix Fichte Date: Tue, 31 Jul 2018 23:23:55 +0200 Subject: [PATCH] Git don't throw up when not on some branch --- zsh/prompt.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zsh/prompt.zsh b/zsh/prompt.zsh index fabc959bcb6..fd1d75d6eac 100644 --- a/zsh/prompt.zsh +++ b/zsh/prompt.zsh @@ -28,7 +28,7 @@ git_dirty() { } git_prompt_info () { - ref=$($git symbolic-ref HEAD 2>/dev/null) || return + ref=$($git symbolic-ref HEAD 2>/dev/null) || (echo "detached HEAD" && return) # echo "(%{\e[0;33m%}${ref#refs/heads/}%{\e[0m%})" echo "${ref#refs/heads/}" } @@ -39,7 +39,7 @@ git_prompt_info () { need_push () { if [ $($git rev-parse --is-inside-work-tree 2>/dev/null) ] then - number=$($git cherry -v origin/$(git symbolic-ref --short HEAD) 2>/dev/null | wc -l | bc) + number=$($git cherry -v origin/$(git symbolic-ref --short HEAD 2>/dev/null) 2>/dev/null | wc -l | bc) if [[ $number == 0 ]] then