summaryrefslogtreecommitdiff
path: root/contrib/completion
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2006-11-05 11:21:03 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-11-05 21:36:32 (GMT)
commit56fc25f21e280c4f3816e989b34d08d7d7cc59fc (patch)
tree040ee5d43623b6f678069cc704b2e1866b32a484 /contrib/completion
parent76c3eb51ede4619116ef980aa34d087c97c25cbc (diff)
downloadgit-56fc25f21e280c4f3816e989b34d08d7d7cc59fc.zip
git-56fc25f21e280c4f3816e989b34d08d7d7cc59fc.tar.gz
git-56fc25f21e280c4f3816e989b34d08d7d7cc59fc.tar.bz2
Bash completion support for remotes in .git/config.
Now that Git natively supports remote specifications within the config file such as: [remote "origin"] url = ... we should provide bash completion support "out of the box" for these remotes, just like we do for the .git/remotes directory. Also cleaned up the __git_aliases expansion to use the same form of querying and filtering repo-config as this saves two fork/execs in the middle of a user prompted completion. Finally also forced the variable 'word' to be local within __git_aliased_command. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'contrib/completion')
-rwxr-xr-xcontrib/completion/git-completion.bash26
1 files changed, 21 insertions, 5 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 926638d..5f1be46 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -59,12 +59,21 @@ __git_refs2 ()
__git_remotes ()
{
- local i REVERTGLOB=$(shopt -p nullglob)
+ local i ngoff IFS=$'\n'
+ shopt -q nullglob || ngoff=1
shopt -s nullglob
for i in .git/remotes/*; do
echo ${i#.git/remotes/}
done
- $REVERTGLOB
+ [ "$ngoff" ] && shopt -u nullglob
+ for i in $(git repo-config --list); do
+ case "$i" in
+ remote.*.url=*)
+ i="${i#remote.}"
+ echo "${i/.url=*/}"
+ ;;
+ esac
+ done
}
__git_complete_file ()
@@ -103,13 +112,20 @@ __git_complete_file ()
__git_aliases ()
{
- git repo-config --list | grep '^alias\.' \
- | sed -e 's/^alias\.//' -e 's/=.*$//'
+ local i IFS=$'\n'
+ for i in $(git repo-config --list); do
+ case "$i" in
+ alias.*)
+ i="${i#alias.}"
+ echo "${i/=*/}"
+ ;;
+ esac
+ done
}
__git_aliased_command ()
{
- local cmdline=$(git repo-config alias.$1)
+ local word cmdline=$(git repo-config --get "alias.$1")
for word in $cmdline; do
if [ "${word##-*}" ]; then
echo $word