From 6acf7f8d3ec689f1f38c19a54a73b46f13ad1db6 Mon Sep 17 00:00:00 2001
From: Martin Gondermann <magicmonty@pagansoft.de>
Date: Tue, 25 Mar 2014 20:25:31 +0100
Subject: [PATCH] Wrapped prompt colors in \[ and \] to fix history. Should fix
 #45

---
 git-prompt-colors.sh | 14 +++++++-------
 git-prompt-help.sh   |  4 ++--
 gitprompt.sh         | 38 +++++++++++++++++++-------------------
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/git-prompt-colors.sh b/git-prompt-colors.sh
index 686804c..7eedc7e 100644
--- a/git-prompt-colors.sh
+++ b/git-prompt-colors.sh
@@ -3,11 +3,11 @@
   GIT_PROMPT_SUFFIX="]"                 # the end of the git info string
   GIT_PROMPT_SEPARATOR="|"              # separates each item
 
-  GIT_PROMPT_BRANCH="${Magenta}"        # the git branch that is active in the current directory
-  GIT_PROMPT_STAGED="${Red}●"           # the number of staged files/directories
-  GIT_PROMPT_CONFLICTS="${Red}✖"        # the number of files in conflict
-  GIT_PROMPT_CHANGED="${Blue}✚"         # the number of changed files
+  GIT_PROMPT_BRANCH="\[${Magenta}\]"        # the git branch that is active in the current directory
+  GIT_PROMPT_STAGED="\[${Red}\]●"           # the number of staged files/directories
+  GIT_PROMPT_CONFLICTS="\[${Red}\]✖"        # the number of files in conflict
+  GIT_PROMPT_CHANGED="\[${Blue}\]✚"         # the number of changed files
   GIT_PROMPT_REMOTE=" "                 # the remote branch name (if any)
-  GIT_PROMPT_UNTRACKED="${Cyan}…"       # the number of untracked files/dirs
-  GIT_PROMPT_STASHED="${BoldBlue}⚑"     # the number of stashed files/dir
-  GIT_PROMPT_CLEAN="${BoldGreen}✔"      # a colored flag indicating a "clean" repo
+  GIT_PROMPT_UNTRACKED="\[${Cyan}\]…"       # the number of untracked files/dirs
+  GIT_PROMPT_STASHED="\[${BoldBlue}\]⚑"     # the number of stashed files/dir
+  GIT_PROMPT_CLEAN="\[${BoldGreen}\]✔"      # a colored flag indicating a "clean" repo
diff --git a/git-prompt-help.sh b/git-prompt-help.sh
index ca6c5de..5d91595 100644
--- a/git-prompt-help.sh
+++ b/git-prompt-help.sh
@@ -3,7 +3,7 @@
 # being displayed.
 
 git_prompt_help() {
- cat <<EOF | sed 's/\\\[\\033//g' | sed 's/\\\]//g'
+ cat <<EOF | sed 's/\\\[\\033//g' | sed 's/\\\[//g' | sed 's/\\\]//g' | sed 's/\\\]//g'
 The git prompt format is [<BRANCH><TRACKING>|<LOCALSTATUS>]
 
 BRANCH is a branch name, such as "master" or "stage", a tag name, or commit
@@ -32,7 +32,7 @@ EOF
 help_git_prompt() { git_prompt_help ; }
 
 git_prompt_examples() {
-  cat <<EOF | sed 's/\\\[\\033//g' | sed 's/\\\]//g'
+  cat <<EOF | sed 's/\\\[\\033//g' | sed 's/\\\[//g' | sed 's/\\\]//g' | sed 's/\\\]//g'
 These are examples of the git prompt:
 
   [${GIT_PROMPT_BRANCH}master${ResetColor}${GIT_PROMPT_REMOTE}↑·3${ResetColor}|${GIT_PROMPT_CHANGED}1${ResetColor}]  - on branch "master", ahead of remote by 3 commits, 1
diff --git a/gitprompt.sh b/gitprompt.sh
index 98ba58f..06600ad 100755
--- a/gitprompt.sh
+++ b/gitprompt.sh
@@ -69,14 +69,14 @@ function git_prompt_config()
     GIT_PROMPT_PREFIX="["
     GIT_PROMPT_SUFFIX="]"
     GIT_PROMPT_SEPARATOR="|"
-    GIT_PROMPT_BRANCH="${Magenta}"
-    GIT_PROMPT_STAGED="${Red}●"
-    GIT_PROMPT_CONFLICTS="${Red}✖"
-    GIT_PROMPT_CHANGED="${Blue}✚"
+    GIT_PROMPT_BRANCH="\[${Magenta}\]"
+    GIT_PROMPT_STAGED="\[${Red}\]●"
+    GIT_PROMPT_CONFLICTS="\[${Red}\]✖"
+    GIT_PROMPT_CHANGED="\[${Blue}\]✚"
     GIT_PROMPT_REMOTE=" "
-    GIT_PROMPT_UNTRACKED="${Cyan}…"
-    GIT_PROMPT_STASHED="${BoldBlue}⚑"
-    GIT_PROMPT_CLEAN="${BoldGreen}✔"
+    GIT_PROMPT_UNTRACKED="\[${Cyan}\]…"
+    GIT_PROMPT_STASHED="\[${BoldBlue}\]⚑"
+    GIT_PROMPT_CLEAN="\[${BoldGreen}\]✔"
   fi
 
   # Various variables you might want for your PS1 prompt instead
@@ -86,13 +86,13 @@ function git_prompt_config()
   local PathShort="\w"
 
   if [ "x${GIT_PROMPT_START}" == "x" ]; then
-    PROMPT_START="${Yellow}${PathShort}${ResetColor}"
+    PROMPT_START="\[${Yellow}\]${PathShort}\[${ResetColor}\]"
   else
     PROMPT_START="${GIT_PROMPT_START}"
   fi
 
   if [ "x${GIT_PROMPT_END}" == "x" ]; then
-    PROMPT_END=" \n${White}${Time12a}${ResetColor} $ "
+    PROMPT_END=" \n\[${White}\]${Time12a}\[${ResetColor}\] $ "
   else
     PROMPT_END="${GIT_PROMPT_END}"
   fi
@@ -108,7 +108,7 @@ function git_prompt_config()
     EMPTY_PROMPT=$OLD_GITPROMPT
   else
     if [[ -n "${VIRTUAL_ENV}" ]]; then
-      EMPTY_PROMPT="(${Blue}$(basename "${VIRTUAL_ENV}")${ResetColor}) ${PROMPT_START}$($prompt_callback)${PROMPT_END}"
+      EMPTY_PROMPT="(\[${Blue}\]$(basename "${VIRTUAL_ENV}")\[${ResetColor\]}) ${PROMPT_START}$($prompt_callback)${PROMPT_END}"
     else
       EMPTY_PROMPT="${PROMPT_START}$($prompt_callback)${PROMPT_END}"
     fi
@@ -204,43 +204,43 @@ function updatePrompt() {
   local GIT_CLEAN=${GitStatus[7]}
 
   if [[ -n "${GitStatus}" ]]; then
-    local STATUS="${PROMPT_LEADING_SPACE}${GIT_PROMPT_PREFIX}${GIT_PROMPT_BRANCH}${GIT_BRANCH}${ResetColor}"
+    local STATUS="${PROMPT_LEADING_SPACE}${GIT_PROMPT_PREFIX}${GIT_PROMPT_BRANCH}${GIT_BRANCH}\[${ResetColor}\]"
 
     if [[ -n "${GIT_REMOTE}" ]]; then
-      STATUS="${STATUS}${GIT_PROMPT_REMOTE}${GIT_REMOTE}${ResetColor}"
+      STATUS="${STATUS}${GIT_PROMPT_REMOTE}${GIT_REMOTE}\[${ResetColor}\]"
     fi
 
     STATUS="${STATUS}${GIT_PROMPT_SEPARATOR}"
     if [ "${GIT_STAGED}" -ne "0" ]; then
-      STATUS="${STATUS}${GIT_PROMPT_STAGED}${GIT_STAGED}${ResetColor}"
+      STATUS="${STATUS}${GIT_PROMPT_STAGED}${GIT_STAGED}\[${ResetColor}\]"
     fi
 
     if [ "${GIT_CONFLICTS}" -ne "0" ]; then
-      STATUS="${STATUS}${GIT_PROMPT_CONFLICTS}${GIT_CONFLICTS}${ResetColor}"
+      STATUS="${STATUS}${GIT_PROMPT_CONFLICTS}${GIT_CONFLICTS}\[${ResetColor}\]"
     fi
 
     if [ "${GIT_CHANGED}" -ne "0" ]; then
-      STATUS="${STATUS}${GIT_PROMPT_CHANGED}${GIT_CHANGED}${ResetColor}"
+      STATUS="${STATUS}${GIT_PROMPT_CHANGED}${GIT_CHANGED}\[${ResetColor}\]"
     fi
 
     if [ "${GIT_UNTRACKED}" -ne "0" ]; then
-      STATUS="${STATUS}${GIT_PROMPT_UNTRACKED}${GIT_UNTRACKED}${ResetColor}"
+      STATUS="${STATUS}${GIT_PROMPT_UNTRACKED}${GIT_UNTRACKED}\[${ResetColor}\]"
     fi
 
     if [ "${GIT_STASHED}" -ne "0" ]; then
-      STATUS="${STATUS}${GIT_PROMPT_STASHED}${GIT_STASHED}${ResetColor}"
+      STATUS="${STATUS}${GIT_PROMPT_STASHED}${GIT_STASHED}\[${ResetColor}\]"
     fi
 
     if [ "${GIT_CLEAN}" -eq "1" ]; then
       STATUS="${STATUS}${GIT_PROMPT_CLEAN}"
     fi
 
-    STATUS="${STATUS}${ResetColor}${GIT_PROMPT_SUFFIX}"
+    STATUS="${STATUS}\[${ResetColor}\]${GIT_PROMPT_SUFFIX}"
 
 
     PS1="${PROMPT_START}$($prompt_callback)${STATUS}${PROMPT_END}"
     if [[ -n "${VIRTUAL_ENV}" ]]; then
-      PS1="(${Blue}$(basename ${VIRTUAL_ENV})${ResetColor}) ${PS1}"
+      PS1="(\[${Blue}\]$(basename ${VIRTUAL_ENV})\[${ResetColor}\]) ${PS1}"
     fi
 
   else