Merge branch 'test'

2 files changed, 18 insertions, 43 deletions

diff --git a/git-prompt.sh b/git-prompt.sh
index f951623..021000f 100755
--- a/git-prompt.sh
+++ b/git-prompt.sh
@@ -15,6 +15,7 @@
         conf=~/.config/git-prompt.conf;         [[ -r $conf ]]  && . $conf
         unset conf
 
+
         #####  set defaults if not set
 
         git_module=${git_module:-on}
@@ -220,22 +221,25 @@ set_shell_label() {
                 # FIXME $STY not inherited though "su -"
                 [ "$STY" ] && screen -S $STY -X title "$*"
         }
+        if [[ -n "$STY" ]]; then
+                screen_label "$*"
+        else
+                case $TERM in
 
-        case $TERM in
+                        screen*)
+                                screen_label "$*"
+                                ;;
 
-                screen*)
-                        screen_label "$*"
-                        ;;
+                        xterm* | rxvt* | gnome-terminal | konsole | eterm | wterm )
+                                # is there a capability which we can to test
+                                # for "set term title-bar" and its escapes?
+                                xterm_label  "$plain_who_where $@"
+                                ;;
 
-                xterm* | rxvt* | gnome-terminal | konsole | eterm | wterm )
-                        # is there a capability which we can to test
-                        # for "set term title-bar" and its escapes?
-                        xterm_label  "$plain_who_where $@"
-                        ;;
-
-                *)
-                        ;;
-        esac
+                        *)
+                                ;;
+                esac
+        fi
  }
 
     export -f set_shell_label
@@ -261,7 +265,7 @@ set_shell_label() {
 
         # we don't need tty name under X11
         case $TERM in
-                xterm* | rxvt* | gnome-terminal | konsole | eterm | wterm )  unset tty ;;
+                xterm* | rxvt* | gnome-terminal | konsole | eterm | wterm | cygwin)  unset tty ;;
                 *);;
         esac
 
@@ -381,24 +385,6 @@ parse_hg_status() {
  }
 
 
-parse_git_complete() {
-        if [ "${BASH_VERSION%.*}" \< "3.0" ]; then
-                # echo "You will need to upgrade 'bash' to version 3.0 \
-                # for full programmable completion features (bash complete) \
-                # Please install bash-completion packet like: $ yum -y install bash-completion"
-                return
-        fi
-
-        complete -f -W "$(
-                echo `git branch -a | sed -e s/[\ \*]//g | cut -f 1 -d ' ' | uniq`; \
-                echo `git remote | sed -e s/[\ \*]//g | cut -f 1 -d ' ' | uniq`; \
-                echo `git | tail -23 | head -21 | cut -d ' ' -f 4`; \
-                echo '--help'; \
-                echo '--staged'; \
-                echo 'remote'; \
-                echo 'help'; \
-        )" g git
-}
 
 parse_git_status() {
 
@@ -411,7 +397,6 @@ parse_git_status() {
         [[  -n ${git_dir/./} ]]   ||   return  1
 
         vcs=git
-        parse_git_complete
 
         ##########################################################   GIT STATUS
 	file_regex='\([^/]*\/\{0,1\}\).*'
diff --git a/index.txt b/index.txt
index 61b68ea..3c816e2 100644
--- a/index.txt
+++ b/index.txt
@@ -87,16 +87,6 @@ j .*3   # same as  cd "~/long dir mp3"
 -------------
 
 
-== Bash Completion
-
-Completion can be done for git subcommands, branches and remotes:
-
----------------------
-git ch<tab>   		#  expands to git checkout
-git checkout ma<tab>	#  expands to git checkout master
---------------------
-
-
 == Install
 Download  link:git-prompt.sh[] or get it with GIT: