From e7e2daa3a20b0f5f5e74de8d44819ab056aea802 Mon Sep 17 00:00:00 2001
From: Leonid Volnitsky <Leonid@Volnitsky.com>
Date: Thu, 26 Jun 2008 12:46:53 +0300
Subject: display: removed <> from op disp

---
 prompt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'prompt')

diff --git a/prompt b/prompt
index b1cfd7a..c0a4c93 100644
--- a/prompt
+++ b/prompt
@@ -344,8 +344,7 @@ parse_git_dir() {
         ### compose vcs_info
 
         if [[ $init ]];  then 
-            vcs_info=init:M
-
+            vcs_info=M$white=init
 
         else
             if [[ "$detached" ]] ;  then     
@@ -357,7 +356,7 @@ parse_git_dir() {
                     if [[ "$op" == "merge" ]] ;  then     
                         branch+="<~$(git-name-rev --name-only $(<$git_dir/MERGE_HEAD))"
                     fi
-                    branch="<$branch>"
+                    #branch="<$branch>"
             fi
             vcs_info="$branch$white=$rawhex"
 
@@ -377,12 +376,12 @@ parse_vcs_dir() {
         ### status:  choose primary (for branch color)
         unset status
         status=${op:+op}
-        status=${status:-$init}
         status=${status:-$detached}
         status=${status:-$clean}
         status=${status:-$modified}
         status=${status:-$added}
         status=${status:-$untracked}
+        status=${status:-$init}
                                 # at least one should be set
                                 : ${status?prompt internal error: git status}
         eval vcs_color="\${${status}_vcs_color}"
-- 
cgit v1.2.3