|
|
|
@ -107,7 +107,6 @@ function git_prompt_config() |
|
|
|
GIT_PROMPT_FETCH_TIMEOUT=${1-5} |
|
|
|
GIT_PROMPT_FETCH_TIMEOUT=${1-5} |
|
|
|
if [ "x$__GIT_STATUS_CMD" == "x" ] |
|
|
|
if [ "x$__GIT_STATUS_CMD" == "x" ] |
|
|
|
then |
|
|
|
then |
|
|
|
git_prompt_dir |
|
|
|
|
|
|
|
local sfx file |
|
|
|
local sfx file |
|
|
|
# look first for a '.sh' version, then use the python version |
|
|
|
# look first for a '.sh' version, then use the python version |
|
|
|
for sfx in sh py ; do |
|
|
|
for sfx in sh py ; do |
|
|
|
@ -125,8 +124,6 @@ function setGitPrompt() { |
|
|
|
local EMPTY_PROMPT |
|
|
|
local EMPTY_PROMPT |
|
|
|
local __GIT_STATUS_CMD |
|
|
|
local __GIT_STATUS_CMD |
|
|
|
|
|
|
|
|
|
|
|
git_prompt_config |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
local repo=`git rev-parse --show-toplevel 2> /dev/null` |
|
|
|
local repo=`git rev-parse --show-toplevel 2> /dev/null` |
|
|
|
if [[ ! -e "${repo}" ]]; then |
|
|
|
if [[ ! -e "${repo}" ]]; then |
|
|
|
PS1="${EMPTY_PROMPT}" |
|
|
|
PS1="${EMPTY_PROMPT}" |
|
|
|
@ -138,9 +135,6 @@ function setGitPrompt() { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
function checkUpstream() { |
|
|
|
function checkUpstream() { |
|
|
|
local GIT_PROMPT_FETCH_TIMEOUT |
|
|
|
|
|
|
|
git_prompt_config |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
local FETCH_HEAD="${repo}/.git/FETCH_HEAD" |
|
|
|
local FETCH_HEAD="${repo}/.git/FETCH_HEAD" |
|
|
|
# Fech repo if local is stale for more than $GIT_FETCH_TIMEOUT minutes |
|
|
|
# Fech repo if local is stale for more than $GIT_FETCH_TIMEOUT minutes |
|
|
|
if [[ ! -e "${FETCH_HEAD}" || -e `find "${FETCH_HEAD}" -mmin +${GIT_PROMPT_FETCH_TIMEOUT}` ]] |
|
|
|
if [[ ! -e "${FETCH_HEAD}" || -e `find "${FETCH_HEAD}" -mmin +${GIT_PROMPT_FETCH_TIMEOUT}` ]] |
|
|
|
@ -259,4 +253,5 @@ else |
|
|
|
fi |
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
git_prompt_dir |
|
|
|
git_prompt_dir |
|
|
|
|
|
|
|
git_prompt_config |
|
|
|
source $__GIT_PROMPT_DIR/git-prompt-help.sh |
|
|
|
source $__GIT_PROMPT_DIR/git-prompt-help.sh |
|
|
|
|