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

GH-1142 add additional set -e coverage

pull/1143/head
Ethan Edwards 2018-02-06 11:30:36 -06:00
parent db55c63c77
commit e5332cb253
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
themes/githelpers.theme.bash
View File

@ -71,7 +71,7 @@ function _git-hide-status {
} }
function _git-status { function _git-status {
[[ "${SCM_GIT_IGNORE_UNTRACKED}" = "true" ]] && local git_status_flags='-uno' [[ "${SCM_GIT_IGNORE_UNTRACKED}" = "true" ]] && local git_status_flags='-uno' || true
git status --porcelain ${git_status_flags} 2> /dev/null git status --porcelain ${git_status_flags} 2> /dev/null
} }
@ -100,9 +100,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 [[ "$(_git-branch)" == "$(_git-upstream-branch)" ]] && local same_branch_name=true || 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 ]]) ||
[[ "${SCM_GIT_SHOW_REMOTE_INFO}" = "true" ]]; then [[ "${SCM_GIT_SHOW_REMOTE_INFO}" = "true" ]]; then
if [[ "${same_branch_name}" != "true" ]]; then if [[ "${same_branch_name}" != "true" ]]; then