From 8d49e389d45f8e0554e72fad4230f50dd7497262 Mon Sep 17 00:00:00 2001 From: Hugues Hiegel Date: Fri, 24 Jan 2014 12:18:46 +0100 Subject: [Submodules] uses pretty-names --- 12_Prompts.zsh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to '12_Prompts.zsh') diff --git a/12_Prompts.zsh b/12_Prompts.zsh index f3139af..d49b947 100644 --- a/12_Prompts.zsh +++ b/12_Prompts.zsh @@ -229,10 +229,13 @@ __subvcsbranches () { # Get recursive submodules statuses for SUBMODULE in $(git config --get zsh.recurse-dirs) do - if [ -d $(dirname $GIT_DIR)/$SUBMODULE/.git -o -d $GIT_DIR/modules/$SUBMODULE ] + _sub=$(dirname $GIT_DIR)/$SUBMODULE/.git + [ ! -d $_sub ] && _sub=$(dirname $GIT_DIR)/modules/$SUBMODULE + if [ -d $_sub ] then GITBRANCH+=${GITBRANCH:+$(tput cuf1)} - GITBRANCH+=$C_$_prompt_colors[bar]$_C"[%{%B%}$SUBMODULE%{%b%}:" + _name=$(GIT_DIR=$_sub git config --get zsh.pretty-name ) + GITBRANCH+=$C_$_prompt_colors[bar]$_C"[%{%B%}"${_name:-$SUBMODULE}"%{%b%}:" GITBRANCH+=$(__get_git_fullstatus $(dirname $GIT_DIR)/$SUBMODULE) GITBRANCH+=$C_$_prompt_colors[bar]$_C"]" fi -- cgit v1.2.3