The files $g/rebase-{merge,apply}/{head-name,msgnum,end} are not
guaranteed to exist.  When attempting to cat them, squelch the error
output to get rid of messages like these:

  cat: .git/rebase-merge/msgnum: No such file or directory
  cat: .git/rebase-merge/end: No such file or directory

Signed-off-by: Ramkumar Ramachandra <artag...@gmail.com>
---
 contrib/completion/git-prompt.sh | 12 ++++++------
 1 file 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"
-- 
1.8.3.1.384.g7cec0b4

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to