c5d9fc996819488801864407ad1b7624acf3c26c

Author
Albert Krewinkel <tarleb@moltkeplatz.de>
Committer
ncanceill <nicolas.canceill@ens-cachan.org>
Date

Message

git_prompt_info: ignore git-config errors

Merged from #2906

The function `git_prompt_info` calls `git config` for its stdout output,
but doesn't handle the stderr output.  This can lead to problems,
e.g. if the git config file is unreadable for some reason (permissions
etc).

This fixes the issue by simply ignoring the stderr output.

Diff

 1diff --git a/lib/git.zsh b/lib/git.zsh
 2index 883bba25ccf70ac4a07e0c6252325c2afea69852..b0e73bf3ab5dabbfb0654b06c4c8f2c4bfbc2a16 100644
 3--- a/lib/git.zsh
 4+++ b/lib/git.zsh
 5@@ -1,6 +1,6 @@
 6 # get the name of the branch we are on
 7 function git_prompt_info() {
 8-  if [[ "$(command git config --get oh-my-zsh.hide-status)" != "1" ]]; then
 9+  if [[ "$(command git config --get oh-my-zsh.hide-status 2>/dev/null)" != "1" ]]; then
10     ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
11     ref=$(command git rev-parse --short HEAD 2> /dev/null) || return 0
12     echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"