diff options
| author | Albert Krewinkel <tarleb@moltkeplatz.de> | 2014-06-24 13:01:41 +0200 |
|---|---|---|
| committer | ncanceill <nicolas.canceill@ens-cachan.org> | 2014-06-28 10:12:20 +0200 |
| commit | c5d9fc996819488801864407ad1b7624acf3c26c (patch) | |
| tree | e70fa47b4c654de7034cc85788a3835fc9550352 /lib | |
| parent | 49161e78472b484015c2080f7a724e95d42b4987 (diff) | |
| download | zsh-c5d9fc996819488801864407ad1b7624acf3c26c.tar.gz zsh-c5d9fc996819488801864407ad1b7624acf3c26c.tar.bz2 zsh-c5d9fc996819488801864407ad1b7624acf3c26c.zip | |
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.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/git.zsh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/git.zsh b/lib/git.zsh index 883bba25c..b0e73bf3a 100644 --- a/lib/git.zsh +++ b/lib/git.zsh @@ -1,6 +1,6 @@ # get the name of the branch we are on function git_prompt_info() { - if [[ "$(command git config --get oh-my-zsh.hide-status)" != "1" ]]; then + if [[ "$(command git config --get oh-my-zsh.hide-status 2>/dev/null)" != "1" ]]; then ref=$(command git symbolic-ref HEAD 2> /dev/null) || \ ref=$(command git rev-parse --short HEAD 2> /dev/null) || return 0 echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX" |