Merge branch 'rr/prompt-rebase-breakage-fix'
* rr/prompt-rebase-breakage-fix: prompt: squelch error output from cat
This commit is contained in:
commit
352e86e543
@ -347,9 +347,9 @@ __git_ps1 ()
|
|||||||
local step=""
|
local step=""
|
||||||
local total=""
|
local total=""
|
||||||
if [ -d "$g/rebase-merge" ]; then
|
if [ -d "$g/rebase-merge" ]; then
|
||||||
b="$(cat "$g/rebase-merge/head-name")"
|
b="$(cat "$g/rebase-merge/head-name" 2>/dev/null)"
|
||||||
step=$(cat "$g/rebase-merge/msgnum")
|
step=$(cat "$g/rebase-merge/msgnum" 2>/dev/null)
|
||||||
total=$(cat "$g/rebase-merge/end")
|
total=$(cat "$g/rebase-merge/end" 2>/dev/null)
|
||||||
if [ -f "$g/rebase-merge/interactive" ]; then
|
if [ -f "$g/rebase-merge/interactive" ]; then
|
||||||
r="|REBASE-i"
|
r="|REBASE-i"
|
||||||
else
|
else
|
||||||
@ -357,10 +357,10 @@ __git_ps1 ()
|
|||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
if [ -d "$g/rebase-apply" ]; then
|
if [ -d "$g/rebase-apply" ]; then
|
||||||
step=$(cat "$g/rebase-apply/next")
|
step=$(cat "$g/rebase-apply/next" 2>/dev/null)
|
||||||
total=$(cat "$g/rebase-apply/last")
|
total=$(cat "$g/rebase-apply/last" 2>/dev/null)
|
||||||
if [ -f "$g/rebase-apply/rebasing" ]; then
|
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"
|
r="|REBASE"
|
||||||
elif [ -f "$g/rebase-apply/applying" ]; then
|
elif [ -f "$g/rebase-apply/applying" ]; then
|
||||||
r="|AM"
|
r="|AM"
|
||||||
|
Loading…
Reference in New Issue
Block a user