completion: work around zsh option propagation bug

When listing commands in zsh (git <TAB><TAB>), all of them will show up, instead of only porcelain ones. The root cause of this is because zsh versions from 4.3.0 to present (4.3.15) do not correctly propagate the SH_WORD_SPLIT option into the subshell in ${foo:=$(bar)} expressions. Because of this bug, the list of all commands was treated as a single word in __git_list_porcelain_commands and did not match any of the patterns that would usually cause plumbing to be excluded. With problematic versions of zsh, after running emulate sh fn () { var='one two' for v in $var; do echo $v; done } x=$(fn) : ${y=$(fn)} printing "$x" results in two lines as expected, but printing "$y" results in a single line because $var is expanded as a single word when evaluating fn to compute y. So avoid the construct, and use an explicit 'test -n "$foo" || foo=$(bar)' instead. [jn: clarified commit message, indentation style fix] Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Felipe Contreras committed Feb 2, 2012 at 11:26 UTC cf0ff02a38b5b97091301224475d81923f3c298f
1 file changed +6 -3
contrib/completion/git-completion.bash
+6 -3
@@ -676,7 +676,8 @@ __git_merge_strategies=
676 # is needed.
677 __git_compute_merge_strategies ()
678 {
679 - : ${__git_merge_strategies:=$(__git_list_merge_strategies)}
679 + test -n "$__git_merge_strategies" ||
680 + __git_merge_strategies=$(__git_list_merge_strategies)
681 }
682
683 __git_complete_revlist_file ()
@@ -854,7 +855,8 @@ __git_list_all_commands ()
855 __git_all_commands=
856 __git_compute_all_commands ()
857 {
857 - : ${__git_all_commands:=$(__git_list_all_commands)}
858 + test -n "$__git_all_commands" ||
859 + __git_all_commands=$(__git_list_all_commands)
860 }
861
862 __git_list_porcelain_commands ()
@@ -947,7 +949,8 @@ __git_porcelain_commands=
949 __git_compute_porcelain_commands ()
950 {
951 __git_compute_all_commands
950 - : ${__git_porcelain_commands:=$(__git_list_porcelain_commands)}
952 + test -n "$__git_porcelain_commands" ||
953 + __git_porcelain_commands=$(__git_list_porcelain_commands)
954 }
955
956 __git_pretty_aliases ()