display: removed <> from op disp

2 files changed, 6 insertions, 4 deletions

diff --git a/git-demo b/git-demo
index 69245e6..e03c939 100644
--- a/git-demo
+++ b/git-demo
@@ -3,6 +3,7 @@ set +xv
 test -d demo && rm -rf demo/
 test -d ../demo && cd .. && rm -rf demo/ 
 clear
+: ------------------------------------------------------------------------
 mkdir demo
 cd demo
 git init
@@ -32,3 +33,5 @@ cat FOO
 git checkout HEAD^
 cat FOO
 git checkout master
+: ------------------------------------------------------------------------
+cd ..
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}"