completion: complete general config vars in two steps

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 97776fb31af371fd92ae4471d6b5ec8dc417ccac..a6f55e856a14fe8d844b8ee419fcb72c8667039a 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2158,9 +2158,14 @@ _git_config ()
                __gitcomp "insteadOf pushInsteadOf" "$pfx" "$cur_"
                return
                ;;
+       *.*)
+               __git_compute_config_vars
+               __gitcomp "$__git_config_vars"
+               ;;
+       *)
+               __git_compute_config_vars
+               __gitcomp "$(echo "$__git_config_vars" | sed 's/\.[^ ]*/./g')"
        esac
-       __git_compute_config_vars
-       __gitcomp "$__git_config_vars"
 }
 
 _git_remote ()