Merge pull request magicmonty#192 from ogr3/environment-fix

magicmonty · magicmonty · commit 22d5591af401 · 2015-10-14T21:43:11.000+02:00
Let GIT_PROMPT_STATUS_COMMAND be set before loading prompt
diff --git a/README.md b/README.md
@@ -125,6 +125,8 @@ git clone https://github.com/magicmonty/bash-git-prompt.git .bash-git-prompt
 
    # GIT_PROMPT_SHOW_UPSTREAM=1 # uncomment to show upstream tracking branch
 
+   # GIT_PROMPT_STATUS_COMMAND=gitstatus_pre-1.7.10.sh # uncomment to support Git older than 1.7.10
+
    # GIT_PROMPT_START=...    # uncomment for custom prompt start sequence
    # GIT_PROMPT_END=...      # uncomment for custom prompt end sequence
 
diff --git a/themes/Default.bgptheme b/themes/Default.bgptheme
@@ -16,7 +16,6 @@ unset_git_prompt_colors() {
   unset GIT_PROMPT_CLEAN
   unset GIT_PROMPT_COMMAND_OK
   unset GIT_PROMPT_COMMAND_FAIL
-  unset GIT_PROMPT_STATUS_COMMAND
   unset GIT_PROMPT_VIRTUALENV
   unset GIT_PROMPT_UPSTREAM
   unset GIT_PROMPT_START_USER
diff --git a/themes/TruncatedPwd_WindowTitle.bgptheme b/themes/TruncatedPwd_WindowTitle.bgptheme
@@ -30,8 +30,6 @@ override_git_prompt_colors() {
     echo -n "[${PS1}]${ResetColor}"
   }
 
-  Time12a="\$(date +%H:%M)"
-
   GIT_PROMPT_START_USER="${Yellow}"
   GIT_PROMPT_START_ROOT="${GIT_PROMPT_START_USER}"
   GIT_PROMPT_END_USER=" _LAST_COMMAND_INDICATOR_\n${White}${Time12a}${ResetColor} $ "
diff --git a/themes/TruncatedPwd_WindowTitle_NoExitState.bgptheme b/themes/TruncatedPwd_WindowTitle_NoExitState.bgptheme
@@ -30,8 +30,6 @@ override_git_prompt_colors() {
     echo -n "[${PS1}]${ResetColor}"
   }
 
-  Time12a="\$(date +%H:%M)"
-
   GIT_PROMPT_START_USER="${Yellow}"
   GIT_PROMPT_START_ROOT="${GIT_PROMPT_START_USER}"
   GIT_PROMPT_END_USER="\n${White}${Time12a}${ResetColor} $ "

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,6 @@ override_git_prompt_colors() {`
`30`	`30`	`echo -n "[${PS1}]${ResetColor}"`
`31`	`31`	`}`
`32`	`32`
`33`		`- Time12a="\$(date +%H:%M)"`
`34`		`-`
`35`	`33`	`GIT_PROMPT_START_USER="${Yellow}"`
`36`	`34`	`GIT_PROMPT_START_ROOT="${GIT_PROMPT_START_USER}"`
`37`	`35`	`GIT_PROMPT_END_USER=" _LAST_COMMAND_INDICATOR_\n${White}${Time12a}${ResetColor} $ "`