From 080393ed9e34699f045df9fbca12ddb30eddbf5b Mon Sep 17 00:00:00 2001 From: Jacobi Carter Date: Sun, 21 Oct 2012 16:47:53 -0500 Subject: [PATCH] More. --- gitconfig | 1 + zsh/prompt | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gitconfig b/gitconfig index 6204f9f..ecda1a4 100644 --- a/gitconfig +++ b/gitconfig @@ -21,6 +21,7 @@ cat = show list = show ls = show + subup = submodule update --init --recursive untrack-ignored = !git-untracked-ignored info = !git-info diff --git a/zsh/prompt b/zsh/prompt index edc176c..a48d6c4 100755 --- a/zsh/prompt +++ b/zsh/prompt @@ -68,6 +68,7 @@ ZSH_THEME_GIT_PROMPT_MODIFIED="!" ZSH_THEME_GIT_PROMPT_DELETED="-" ZSH_THEME_GIT_PROMPT_UNMERGED="&" ZSH_THEME_GIT_PROMPT_RENAMED=">" +ZSH_THEME_GIT_PROMPT_SUBMODULE="_" git_prompt_status() { INDEX=$(git status --porcelain 2> /dev/null) STATUS="" @@ -97,6 +98,9 @@ git_prompt_status() { if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS" fi + if $(cd "$1" ; git submodule status --recursive | egrep '^(\+|-)' &> /dev/null); then + STATUS="$ZSH_THEME_GIT_PROMPT_SUBMODULE$STATUS" + fi echo $STATUS } function updateprompt () { @@ -158,7 +162,7 @@ function updateprompt () { stashes=$(git stash list 2>/dev/null | wc -l) stashpart="${RESETCOLOR}${GRAY}(${GREEN}${stashes}${GRAY} stashed)${RESETCOLOR}" fi - local stats="$(git_prompt_status)" + local stats="$(git_prompt_status "${repodir}")" PROMPT=${RESETCOLOR}${HOSTCOLOR}$'%n@'${LHOSTNAME}${BLACKCOLOR}':'${PATHCOLOR}"${reponame} ${RED}${branch}${YELLOW}${stats}${BLACKCOLOR}${additional} ${PATHCOLOR}"$'%45<...<'"${repopath}"' %(?..'${BOLDERRORCOLOR}$')%(!.#.$) '${RESETCOLOR} RPROMPT=${RESETCOLOR}${stashpart}${remotepart}$'%1(j.'${JOBCOLOR}$'[%j].)%(?..'${ERRORCOLOR}$'[%?])'${CLOCKCOLOR}$'[%t]'${RESETCOLOR} cdpath=( . "$repodir" ~ ~/Giftikigit ~/launchrockgit ~/loagit ~/git .. )