[PATCH] completion: __git_config_get_set_variables() handle values with spaces

Stephen Boyd· Jun 30, 2009, 05:08 UTC · lore

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>
---
 contrib/completion/git-completion.bash |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

Show changes to contrib/completion/git-completion.bash +6 −5

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index b60cb68..d676f9d 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

-- 
1.6.3.3.353.g4f2b1

Stephen Boyd· Jul 2, 2009, 06:04 UTC · re: Stephen Boyd · lore

Re: [PATCH] completion: __git_config_get_set_variables() handle values with spaces

Stephen Boyd wrote:

Show 5 quoted lines

> For example
>
>  $ cat .git/config
>    format.cc = Junio C Hamano <gitster@pobox.com>
>

Sorry this is inaccurate. Something more like
$ cat .git/config
[format]
        cc = Junio C Hamano <gitster@pobox.com>

would be correct, but I think you got the point.

patchcompletion: __git_config_get_set_variables() handle values with spaces