XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into fix/show-only-merges-into-master

pull/1281/head
Travis Swicegood 2018-12-03 21:17:56 -06:00
parent babb1e6675 97df5c4540
commit 20b61a362f
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
themes/base.theme.bash
View File

@ -139,9 +139,9 @@ function scm_prompt_info_common {
fi fi
# TODO: consider adding minimal status information for hg and svn # TODO: consider adding minimal status information for hg and svn
[[ ${SCM} == ${SCM_P4} ]] && p4_prompt_info && return { [[ ${SCM} == ${SCM_P4} ]] && p4_prompt_info && return; } || true
[[ ${SCM} == ${SCM_HG} ]] && hg_prompt_info && return { [[ ${SCM} == ${SCM_HG} ]] && hg_prompt_info && return; } || true
[[ ${SCM} == ${SCM_SVN} ]] && svn_prompt_info && return { [[ ${SCM} == ${SCM_SVN} ]] && svn_prompt_info && return; } || true
} }
function git_prompt_minimal_info { function git_prompt_minimal_info {

5
themes/githelpers.theme.bash
View File

@ -72,7 +72,7 @@ function _git-hide-status {
function _git-status { function _git-status {
local git_status_flags= local git_status_flags=
[[ "${SCM_GIT_IGNORE_UNTRACKED}" = "true" ]] && git_status_flags='-uno' [[ "${SCM_GIT_IGNORE_UNTRACKED}" = "true" ]] && git_status_flags='-uno' || true
git status --porcelain ${git_status_flags} 2> /dev/null git status --porcelain ${git_status_flags} 2> /dev/null
} }
@ -101,8 +101,9 @@ function _git-status-counts {
} }
function _git-remote-info { function _git-remote-info {
[[ "$(_git-upstream)" == "" ]] && return [[ "$(_git-upstream)" == "" ]] && return || true
[[ "$(_git-branch)" == "$(_git-upstream-branch)" ]] && local same_branch_name=true || true
local same_branch_name= local same_branch_name=
[[ "$(_git-branch)" == "$(_git-upstream-branch)" ]] && same_branch_name=true [[ "$(_git-branch)" == "$(_git-upstream-branch)" ]] && same_branch_name=true
if ([[ "${SCM_GIT_SHOW_REMOTE_INFO}" = "auto" ]] && [[ "$(_git-num-remotes)" -ge 2 ]]) || if ([[ "${SCM_GIT_SHOW_REMOTE_INFO}" = "auto" ]] && [[ "$(_git-num-remotes)" -ge 2 ]]) ||