From: Benjamin Fuchs Date: Mon, 30 Jan 2017 20:44:24 GMT Subject: [PATCH 3/4] git-prompt.sh: fix for submodule 'dirty' indicator Message-ID: <1485809065-11978-4-git-send-email-email@benjaminfuchs.de> In-Reply-To: <1485809065-11978-1-git-send-email-email@benjaminfuchs.de> Fixing wrong git diff line. Signed-off-by: Benjamin Fuchs --- contrib/completion/git-prompt.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index c44b9a2..43b28e9 100644 --- a/contrib/completion/git-prompt.sh +++ b/contrib/completion/git-prompt.sh @@ -306,9 +306,9 @@ __git_ps1_submodule () local submodule_name="$(basename "$git_dir")" if [ "$submodule_name" != ".git" ] && [ "$submodule_name" != "." ]; then local parent_top="${git_dir%.git*}" - local submodule_top="${git_dir#*modules}" + local submodule_top="${git_dir#*modules/}" local status="" - git diff -C "$parent_top" --no-ext-diff --ignore-submodules=dirty --quiet -- "$submodule_top" 2>/dev/null || status="+" + git -C "$parent_top" diff --no-ext-diff --ignore-submodules=dirty --quiet -- "$submodule_top" 2>/dev/null || status="+" printf "$status$submodule_name:" fi } @@ -544,7 +544,7 @@ __git_ps1 () local sub="" if [ -n "${GIT_PS1_SHOWSUBMODULE}" ]; then - sub="$(__git_ps1_submodule $g)" + sub="$(__git_ps1_submodule "$g")" fi local f="$w$i$s$u" -- 2.7.4