summaryrefslogtreecommitdiff
path: root/contrib/completion
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-23 21:53:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-23 21:53:05 (GMT)
commit352e86e5431509b6834b6d22d139356b6ba6e1b9 (patch)
tree4810a7f80587afd0b4f8aa81a53b77a07b32733e /contrib/completion
parent1a22bd31f0a5130ce6c934951a5526ceb774c2be (diff)
parent2847cae835fa70f00e6e2286fbfa5595cb2247d0 (diff)
downloadgit-352e86e5431509b6834b6d22d139356b6ba6e1b9.zip
git-352e86e5431509b6834b6d22d139356b6ba6e1b9.tar.gz
git-352e86e5431509b6834b6d22d139356b6ba6e1b9.tar.bz2
Merge branch 'rr/prompt-rebase-breakage-fix'
* rr/prompt-rebase-breakage-fix: prompt: squelch error output from cat
Diffstat (limited to 'contrib/completion')
-rw-r--r--contrib/completion/git-prompt.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 86a4f3f..07a6218 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -347,9 +347,9 @@ __git_ps1 ()
local step=""
local total=""
if [ -d "$g/rebase-merge" ]; then
- b="$(cat "$g/rebase-merge/head-name")"
- step=$(cat "$g/rebase-merge/msgnum")
- total=$(cat "$g/rebase-merge/end")
+ b="$(cat "$g/rebase-merge/head-name" 2>/dev/null)"
+ step=$(cat "$g/rebase-merge/msgnum" 2>/dev/null)
+ total=$(cat "$g/rebase-merge/end" 2>/dev/null)
if [ -f "$g/rebase-merge/interactive" ]; then
r="|REBASE-i"
else
@@ -357,10 +357,10 @@ __git_ps1 ()
fi
else
if [ -d "$g/rebase-apply" ]; then
- step=$(cat "$g/rebase-apply/next")
- total=$(cat "$g/rebase-apply/last")
+ step=$(cat "$g/rebase-apply/next" 2>/dev/null)
+ total=$(cat "$g/rebase-apply/last" 2>/dev/null)
if [ -f "$g/rebase-apply/rebasing" ]; then
- b="$(cat "$g/rebase-apply/head-name")"
+ b="$(cat "$g/rebase-apply/head-name" 2>/dev/null)"
r="|REBASE"
elif [ -f "$g/rebase-apply/applying" ]; then
r="|AM"