From: Felipe Contreras Date: Sun, 15 Apr 2012 21:17:34 GMT Subject: [PATCH] completion: fix issues with COMP_WORDBREAKS Message-ID: <1334524654-13482-1-git-send-email-felipe.contreras@gmail.com> The situation regarding COMP_WORDBREAKS has changed through time, but right now due to changes in bash 4 we are using _get_comp_words_by_ref and there's no need to mess directly with COMP_WORDBREAKS any more. In fact if COMP_WORDBREAKS doesn't contain a colon the completion gets all messed up. For example: git push origin master: git diff master: The "master:" prefix would be added again, unnecessarily. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.bash | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 9f56ec7..d9771f2 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -65,11 +65,6 @@ if [[ -n ${ZSH_VERSION-} ]]; then autoload -U +X bashcompinit && bashcompinit fi -case "$COMP_WORDBREAKS" in -*:*) : great ;; -*) COMP_WORDBREAKS="$COMP_WORDBREAKS:" -esac - # __gitdir accepts 0 or 1 arguments (i.e., location) # returns location of .git repo __gitdir () @@ -671,11 +666,6 @@ __git_complete_revlist_file () ;; esac - case "$COMP_WORDBREAKS" in - *:*) : great ;; - *) pfx="$ref:$pfx" ;; - esac - local IFS=$'\n' COMPREPLY=($(compgen -P "$pfx" \ -W "$(git --git-dir="$(__gitdir)" ls-tree "$ls" \ @@ -758,10 +748,6 @@ __git_complete_remote_or_refspec () [ "$remote" = "." ] && remote= case "$cur_" in *:*) - case "$COMP_WORDBREAKS" in - *:*) : great ;; - *) pfx="${cur_%%:*}:" ;; - esac cur_="${cur_#*:}" lhs=0 ;; -- 1.7.10