|
|
|
@ -2,9 +2,9 @@ |
|
|
|
|
|
|
|
|
|
|
|
function async_run() |
|
|
|
function async_run() |
|
|
|
{ |
|
|
|
{ |
|
|
|
{ |
|
|
|
{ |
|
|
|
$1 &> /dev/null |
|
|
|
$1 &> /dev/null |
|
|
|
}& |
|
|
|
}& |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
function git_prompt_dir() |
|
|
|
function git_prompt_dir() |
|
|
|
@ -96,7 +96,7 @@ function setGitPrompt() { |
|
|
|
PS1="${EMPTY_PROMPT}" |
|
|
|
PS1="${EMPTY_PROMPT}" |
|
|
|
return |
|
|
|
return |
|
|
|
fi |
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
checkUpstream |
|
|
|
checkUpstream |
|
|
|
updatePrompt |
|
|
|
updatePrompt |
|
|
|
} |
|
|
|
} |
|
|
|
@ -110,8 +110,8 @@ function checkUpstream() { |
|
|
|
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}` ]] |
|
|
|
then |
|
|
|
then |
|
|
|
if [[ -n $(git remote show) ]]; then |
|
|
|
if [[ -n $(git remote show) ]]; then |
|
|
|
async_run "git fetch --quiet" |
|
|
|
async_run "git fetch --quiet" |
|
|
|
disown |
|
|
|
disown |
|
|
|
fi |
|
|
|
fi |
|
|
|
fi |
|
|
|
fi |
|
|
|
} |
|
|
|
} |
|
|
|
|