Minor clean up of if-then nesting in checks for environment variables
and config options. No functional changes.
---
 contrib/completion/git-prompt.sh |   27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 9b2eec2..e29694d 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -320,26 +320,25 @@ __git_ps1 ()
                                b="GIT_DIR!"
                        fi
                elif [ "true" = "$(git rev-parse --is-inside-work-tree 
2>/dev/null)" ]; then
-                       if [ -n "${GIT_PS1_SHOWDIRTYSTATE-}" ]; then
-                               if [ "$(git config --bool bash.showDirtyState)" 
!= "false" ]; then
-                                       git diff --no-ext-diff --quiet 
--exit-code || w="*"
-                                       if git rev-parse --quiet --verify HEAD 
>/dev/null; then
-                                               git diff-index --cached --quiet 
HEAD -- || i="+"
-                                       else
-                                               i="#"
-                                       fi
+                       if test -n "${GIT_PS1_SHOWDIRTYSTATE-}" &&
+                          test "$(git config --bool bash.showDirtyState)" != 
"false"
+                       then
+                               git diff --no-ext-diff --quiet --exit-code || 
w="*"
+                               if git rev-parse --quiet --verify HEAD 
>/dev/null; then
+                                       git diff-index --cached --quiet HEAD -- 
|| i="+"
+                               else
+                                       i="#"
                                fi
                        fi
                        if [ -n "${GIT_PS1_SHOWSTASHSTATE-}" ]; then
                                git rev-parse --verify refs/stash >/dev/null 
2>&1 && s="$"
                        fi
 
-                       if [ -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" ]; then
-                               if [ "$(git config --bool 
bash.showUntrackedFiles)" != "false" ]; then
-                                       if [ -n "$(git ls-files --others 
--exclude-standard)" ]; then
-                                               u="%"
-                                       fi
-                               fi
+                       if test -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" &&
+                          test "$(git config --bool bash.showUntrackedFiles)" 
!= "false" &&
+                          test -n "$(git ls-files --others --exclude-standard)"
+                       then
+                               u="%"
                        fi
 
                        if [ -n "${GIT_PS1_SHOWUPSTREAM-}" ]; then
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to