From ffe831d659c0c61ba8a797640e99b3fb8bb00bd1 Mon Sep 17 00:00:00 2001 From: oGre Date: Sat, 12 Sep 2015 17:48:43 +0200 Subject: [PATCH 1/3] Missed two functions --- gitprompt.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gitprompt.sh b/gitprompt.sh index ed60902..e02fb68 100755 --- a/gitprompt.sh +++ b/gitprompt.sh @@ -1,7 +1,6 @@ #!/bin/sh -function async_run() -{ +function async_run() { { eval "$@" &> /dev/null }& @@ -421,8 +420,7 @@ function checkUpstream() { fi } -function replaceSymbols() -{ +function replaceSymbols() { if [[ -z ${GIT_PROMPT_SYMBOLS_NO_REMOTE_TRACKING} ]]; then GIT_PROMPT_SYMBOLS_NO_REMOTE_TRACKING=L fi From df40c38f265388f1be0913d22fd744a51e648551 Mon Sep 17 00:00:00 2001 From: oGre Date: Sat, 12 Sep 2015 21:08:15 +0200 Subject: [PATCH 2/3] re-indented replaceSymbols function containing tab stops --- gitprompt.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gitprompt.sh b/gitprompt.sh index e02fb68..97b12d0 100755 --- a/gitprompt.sh +++ b/gitprompt.sh @@ -425,11 +425,11 @@ function replaceSymbols() { GIT_PROMPT_SYMBOLS_NO_REMOTE_TRACKING=L fi - local VALUE=${1//_AHEAD_/${GIT_PROMPT_SYMBOLS_AHEAD}} - local VALUE1=${VALUE//_BEHIND_/${GIT_PROMPT_SYMBOLS_BEHIND}} + local VALUE=${1//_AHEAD_/${GIT_PROMPT_SYMBOLS_AHEAD}} + local VALUE1=${VALUE//_BEHIND_/${GIT_PROMPT_SYMBOLS_BEHIND}} local VALUE2=${VALUE1//_NO_REMOTE_TRACKING_/${GIT_PROMPT_SYMBOLS_NO_REMOTE_TRACKING}} - echo ${VALUE2//_PREHASH_/${GIT_PROMPT_SYMBOLS_PREHASH}} + echo ${VALUE2//_PREHASH_/${GIT_PROMPT_SYMBOLS_PREHASH}} } function updatePrompt() { From d83795adcbb37aed26a3bb3484fb63f9ae4869b9 Mon Sep 17 00:00:00 2001 From: oGre Date: Tue, 22 Sep 2015 07:10:32 +0200 Subject: [PATCH 3/3] Revert unset prompt_callback and extra call to git_prompt_reset --- gitprompt.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/gitprompt.sh b/gitprompt.sh index 97b12d0..da53548 100755 --- a/gitprompt.sh +++ b/gitprompt.sh @@ -65,7 +65,6 @@ function get_theme() { } function git_prompt_load_theme() { - git_prompt_reset get_theme local DEFAULT_THEME_FILE="${__GIT_PROMPT_DIR}/themes/Default.bgptheme" source "${DEFAULT_THEME_FILE}" @@ -179,7 +178,6 @@ git_prompt_reset() { for var in GIT_PROMPT_DIR __GIT_PROMPT_COLORS_FILE __PROMPT_COLORS_FILE __GIT_STATUS_CMD GIT_PROMPT_THEME_NAME; do unset $var done - unset -f prompt_callback } # gp_format_exit_status RETVAL