Merge branch 'rr/complete-difftool-fixup'

diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 263d2d709969413e3590ef2788be7a415218f7b6..86a4f3fa49cf68e14a6b0de13cb7f63fe8a2624d 100644 (file)
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -20,7 +20,8 @@
 #        <post>, which are strings you would put in $PS1 before
 #        and after the status string generated by the git-prompt
 #        machinery.  e.g.
-#           PROMPT_COMMAND='__git_ps1 "\u@\h:\w" "\\\$ "'
+#        Bash: PROMPT_COMMAND='__git_ps1 "\u@\h:\w" "\\\$ "'
+#        ZSH:  precmd () { __git_ps1 "%n" ":%~$ " "|%s" }
 #        will show username, at-sign, host, colon, cwd, then
 #        various status string, followed by dollar and SP, as
 #        your prompt.
@@ -124,7 +125,7 @@ __git_ps1_show_upstream ()
                        fi
                        ;;
                svn-remote.*.url)
-                       svn_remote[ $((${#svn_remote[@]} + 1)) ]="$value"
+                       svn_remote[$((${#svn_remote[@]} + 1))]="$value"
                        svn_url_pattern+="\\|$value"
                        upstream=svn+git # default upstream is SVN if available, else git
                        ;;
@@ -146,10 +147,11 @@ __git_ps1_show_upstream ()
        svn*)
                # get the upstream from the "git-svn-id: ..." in a commit message
                # (git-svn uses essentially the same procedure internally)
-               local svn_upstream=($(git log --first-parent -1 \
+               local -a svn_upstream
+               svn_upstream=($(git log --first-parent -1 \
                                        --grep="^git-svn-id: \(${svn_url_pattern#??}\)" 2>/dev/null))
                if [[ 0 -ne ${#svn_upstream[@]} ]]; then
-                       svn_upstream=${svn_upstream[ ${#svn_upstream[@]} - 2 ]}
+                       svn_upstream=${svn_upstream[${#svn_upstream[@]} - 2]}
                        svn_upstream=${svn_upstream%@*}
                        local n_stop="${#svn_remote[@]}"
                        for ((n=1; n <= n_stop; n++)); do
@@ -227,6 +229,43 @@ __git_ps1_show_upstream ()
 # places.
 __git_ps1_colorize_gitstring ()
 {
+       if [[ -n ${ZSH_VERSION-} ]]; then
+               local c_red='%F{red}'
+               local c_green='%F{green}'
+               local c_lblue='%F{blue}'
+               local c_clear='%f'
+               local bad_color=$c_red
+               local ok_color=$c_green
+               local branch_color="$c_clear"
+               local flags_color="$c_lblue"
+               local branchstring="$c${b##refs/heads/}"
+
+               if [ $detached = no ]; then
+                       branch_color="$ok_color"
+               else
+                       branch_color="$bad_color"
+               fi
+
+               gitstring="$branch_color$branchstring$c_clear"
+
+               if [ -n "$w$i$s$u$r$p" ]; then
+                       gitstring="$gitstring$z"
+               fi
+               if [ "$w" = "*" ]; then
+                       gitstring="$gitstring$bad_color$w"
+               fi
+               if [ -n "$i" ]; then
+                       gitstring="$gitstring$ok_color$i"
+               fi
+               if [ -n "$s" ]; then
+                       gitstring="$gitstring$flags_color$s"
+               fi
+               if [ -n "$u" ]; then
+                       gitstring="$gitstring$bad_color$u"
+               fi
+               gitstring="$gitstring$c_clear$r$p"
+               return
+       fi
        local c_red='\e[31m'
        local c_green='\e[32m'
        local c_lblue='\e[1;34m'
@@ -321,6 +360,7 @@ __git_ps1 ()
                                step=$(cat "$g/rebase-apply/next")
                                total=$(cat "$g/rebase-apply/last")
                                if [ -f "$g/rebase-apply/rebasing" ]; then
+                                       b="$(cat "$g/rebase-apply/head-name")"
                                        r="|REBASE"
                                elif [ -f "$g/rebase-apply/applying" ]; then
                                        r="|AM"
@@ -337,6 +377,7 @@ __git_ps1 ()
                                r="|BISECTING"
                        fi
 
+                       test -n "$b" ||
                        b="$(git symbolic-ref HEAD 2>/dev/null)" || {
                                detached=yes
                                b="$(