Explorar o código

Simplify `__gitp_op` output

Since we have split the bare repo check out into its own section, there
is no longer any need to append indicators to an `op` variable.
Weiyi Lou %!s(int64=9) %!d(string=hai) anos
pai
achega
d4ed2e7b40
Modificáronse 1 ficheiros con 3 adicións e 5 borrados
  1. 3 5
      shell/common/git-prompt.sh

+ 3 - 5
shell/common/git-prompt.sh

@@ -97,16 +97,14 @@ function __gitp_op() {
   local bisect=${GITP_BISECT:-"$cRed BISECT"}
   local  merge=${GITP_MERGE:-"$cRed MERGE"}
   local rebase=${GITP_REBASE:-"$cRed REBASE"}
-  local op
 
   if [[ -e "$1/BISECT_LOG" ]]; then
-    op+="$bisect"
+    echo "$bisect"
   elif [[ -e "$1/MERGE_HEAD" ]]; then
-    op+="$merge"
+    echo "$merge"
   elif [[ -e "$1/rebase" || -e "$1/rebase-apply" ||  -e "$1/rebase-merge" || -e "$1/../.dotest" ]]; then
-    op+="$rebase"
+    echo "$rebase"
   fi
-  echo "$op"
 }
 
 # Compare the local and remote tracking branches (upstream).