summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Stephen Boyd <bebarino@gmail.com>2009-06-29 22:08:38 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-07-06 09:45:00 -0700
commitf581de1b7b9d17c83b188bf8ffe536fb8a9dd2a4 (patch)
treea11dae2c4e5ee93216ef9d127f0af217728d2e92
parentMerge branch 'tr/die_errno' (diff)
downloadtgif-f581de1b7b9d17c83b188bf8ffe536fb8a9dd2a4.tar.xz
completion: __git_config_get_set_variables() handle values with spaces
Commit 0065236 (bash completion: complete variable names for "git config" with options 2009-05-08) implemented its config variable search wrong. When a config contains a value with a space and a period (.) in it, completion erroneously thinks that line in the configuration is multiple config variables. For example $ cat .git/config format.cc = Junio C Hamano <gitster@pobox.com> $ git config --unset <TAB> format.cc <gitster@pobox.com> Instead of using a for loop splitting across spaces, pipe each line to a while read loop and beef up the case statement to match only 'config.variable=value'. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xcontrib/completion/git-completion.bash11
1 files changed, 6 insertions, 5 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 1f44ec2092..9c488646d0 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1357,11 +1357,12 @@ __git_config_get_set_variables ()
c=$((--c))
done
- for i in $(git --git-dir="$(__gitdir)" config $config_file --list \
- 2>/dev/null); do
- case "$i" in
- *.*)
- echo "${i/=*/}"
+ git --git-dir="$(__gitdir)" config $config_file --list 2>/dev/null |
+ while read line
+ do
+ case "$line" in
+ *.*=*)
+ echo "${line/=*/}"
;;
esac
done