Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history
* maint:
  Revert "completion: fix shell expansion of items"
  • Loading branch information
Junio C Hamano committed Sep 25, 2012
2 parents b5d156c + 666ca59 commit 8e609b2
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions contrib/completion/git-completion.bash
Original file line number Diff line number Diff line change
Expand Up @@ -225,13 +225,6 @@ _get_comp_words_by_ref ()
fi
fi

# Quotes the argument for shell reuse
__git_quote()
{
local quoted=${1//\'/\'\\\'\'}
printf "'%s'" "$quoted"
}

# Generates completion reply with compgen, appending a space to possible
# completion words, if necessary.
# It accepts 1 to 4 arguments:
Expand Down Expand Up @@ -268,7 +261,7 @@ __gitcomp ()
__gitcomp_nl ()
{
local IFS=$'\n'
COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$(__git_quote "$1")" -- "${3-$cur}"))
COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$1" -- "${3-$cur}"))
}

__git_heads ()
Expand Down

0 comments on commit 8e609b2

Please sign in to comment.