From 6fd95f313f42e2c1393db64dc180152ec96b1523 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 8 Sep 2016 09:46:01 +1200 Subject: Fix an issue (silencing Git prompt errors) --- ISSUES.markdown | 4 ---- bash/bashrc.d/prompt.bash | 2 +- pdksh/pdkshrc.d/prompt.pdksh | 2 +- zsh/zshrc.d/prompt.zsh | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/ISSUES.markdown b/ISSUES.markdown index eb806f3f..2715bfbb 100644 --- a/ISSUES.markdown +++ b/ISSUES.markdown @@ -30,7 +30,3 @@ Known issues * sxhkd(1) might be nicer than xbindkeys; it's in Debian Testing now * Maybe I should port some of the prompt functions to POSIX sh so I don't have to maintain parallel versions for bash, pdksh, and zsh -* Looks like the Git prompt is still spitting unwanted errors: - - tom@REDACTED:REDACTED(git:master!?)$ sudo rm -r wp-admin.old wp-includes.old - fatal: Unable to create 'REDACTED/.git/index.lock': Permission denied diff --git a/bash/bashrc.d/prompt.bash b/bash/bashrc.d/prompt.bash index 39ee175b..e7e285a7 100644 --- a/bash/bashrc.d/prompt.bash +++ b/bash/bashrc.d/prompt.bash @@ -97,7 +97,7 @@ prompt() { [[ $iswt = true ]] || return # Refresh index so e.g. git-diff-files(1) is accurate - git update-index --refresh >/dev/null + git update-index --refresh >/dev/null 2>&1 # Find a local branch, remote branch, or tag (annotated or not), or # failing all of that just show the short commit ID, in that order diff --git a/pdksh/pdkshrc.d/prompt.pdksh b/pdksh/pdkshrc.d/prompt.pdksh index 7e6dd8fe..c446d3fe 100644 --- a/pdksh/pdkshrc.d/prompt.pdksh +++ b/pdksh/pdkshrc.d/prompt.pdksh @@ -93,7 +93,7 @@ prompt() { [[ $iswt = true ]] || return # Refresh index so e.g. git-diff-files(1) is accurate - git update-index --refresh >/dev/null + git update-index --refresh >/dev/null 2>&1 # Find a local branch, remote branch, or tag (annotated or not), or # failing all of that just show the short commit ID, in that order diff --git a/zsh/zshrc.d/prompt.zsh b/zsh/zshrc.d/prompt.zsh index 858ec2ea..48a3d5f9 100644 --- a/zsh/zshrc.d/prompt.zsh +++ b/zsh/zshrc.d/prompt.zsh @@ -62,7 +62,7 @@ prompt() { [[ $iswt = true ]] || return # Refresh index so e.g. git-diff-files(1) is accurate - git update-index --refresh >/dev/null + git update-index --refresh >/dev/null 2>&1 # Find a local branch, remote branch, or tag (annotated or not), or # failing all of that just show the short commit ID, in that order -- cgit v1.2.3