Re: [PATCH v3 1/4] completion: be nicer with zsh

Felipe Contreras <felipe.contreras@gmail.com> writes:

What entitles you to force me to refraining from commenting at all until I read everything in my mailbox and after waiting for a while to make sure there is no more to come to the thread?

In any case, "be nicer with zsh" conveys no more meaningful information than "this is some patch about zsh". Let's try to avoid warm and fuzzy words that imply "goodness", e.g. "improve" and "be nicer with" because nobody sends a patch to purposefully make Git worse and expects it to be applied.

I found Jonathan's alternative "avoid default value assignment on : true command" at least a bit better for the purpose of jogging the short-term memory in the "'git shortlog v1.7.9.. contrib/completion/' tells us that we have applied several patches, and I remember that : ${var=word} one!" sense. It is not super-useful for the longer term, though.

Here is what I ended up in preparation for queuing the series. I still haven't seen any version of 4/4, but please check $gmane/189683 and see if that matches what you intended. Also I am assuming $gmane/189606 relayed by Jonathan is a squash between your 2 and 3 (which didn't reach me), so please advise if that does not match what you want to have.

Thanks.

-- >8 --
From: Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH] completion: work around zsh option propagation bug

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. For example, after running

	emulate sh
	fn () {
		var='one two'
		printf '%s\n' $var
	}
	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. This fixes a bug tht caused all commands to be treated as porcelain and show up in "git <TAB><TAB>" completion, because 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.

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