mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sg/completion-config'

Browse Source 
Code clean-up for completion script (in contrib/).

* sg/completion-config:
  completion: simplify query for config variables
  completion: add a helper function to get config variables
This commit is contained in:
Junio C Hamano
2015-05-22 12:41:53 -07:00
parent faa4b2ecbb 12bdc880c7
commit 935d937644
2 changed files with 48 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
contrib/completion/git-completion.bash
View File

@ -739,30 +739,25 @@ __git_compute_porcelain_commands ()
__git_porcelain_commands=$(__git_list_porcelain_commands)
}
# Lists all set config variables starting with the given section prefix,
# with the prefix removed.
__git_get_config_variables ()
{
local section="$1" i IFS=$'\n'
for i in $(git --git-dir="$(__gitdir)" config --get-regexp "^$section\..*" 2>/dev/null); do
i="${i#$section.}"
echo "${i/ */}"
done
}
__git_pretty_aliases ()
{
local i IFS=$'\n'
for i in $(git --git-dir="$(__gitdir)" config --get-regexp "pretty\..*" 2>/dev/null); do
case "$i" in
pretty.*)
i="${i#pretty.}"
echo "${i/ */}"
;;
esac
done
__git_get_config_variables "pretty"
}
__git_aliases ()
{
local i IFS=$'\n'
for i in $(git --git-dir="$(__gitdir)" config --get-regexp "alias\..*" 2>/dev/null); do
case "$i" in
alias.*)
i="${i#alias.}"
echo "${i/ */}"
;;
esac
done
__git_get_config_variables "alias"
}
# __git_aliased_command requires 1 argument
@ -2260,12 +2255,7 @@ _git_remote ()
__git_complete_remote_or_refspec
;;
update)
local i c='' IFS=$'\n'
for i in $(git --git-dir="$(__gitdir)" config --get-regexp "remotes\..*" 2>/dev/null); do
i="${i#remotes.}"
c="$c ${i/ */}"
done
__gitcomp "$c"
__gitcomp "$(__git_get_config_variables "remotes")"
;;
*)
;;