[PATCH] zsh completion: 5.0.3 compat, use emulate

[PATCH] zsh completion: 5.0.3 compat, use emulate

[Phil Pennock]

The bash completion pulled into zsh was being pulled in _as_ zsh, but
used patterns which relied on falling through as unhandled.  In zsh
5.0.3 this no longer works, resulting in:

    __git_complete_remote_or_refspec:33: bad pattern: +*

Fix by telling zsh to emulate sh while sourcing the bash config file,
which stickily preserves compatibility options in the function context.
This usage of "emulate" came in with zsh 4.3.10, released 2009-06-01.

Signed-off-by: Phil Pennock <pdp@spodhuis.org>
---
nb: I am not on the git mailing-list, please keep me CC'd.
    I have read SubmittingPatches but let me know if I've missed something.
    Fix applies (unmodified) to both master and maint.
    Thanks.

 contrib/completion/git-completion.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
index fac5e71..d898b65 100644
--- a/contrib/completion/git-completion.zsh
+++ b/contrib/completion/git-completion.zsh
@@ -39,7 +39,7 @@ if [ -z "$script" ]; then
 		test -f $e && script="$e" && break
 	done
 fi
-ZSH_VERSION='' . "$script"
+emulate sh -c 'ZSH_VERSION="" . "$script"'
 
 __gitcomp ()
 {
-- 
1.8.5.1

RE: [PATCH] zsh completion: 5.0.3 compat, use emulate

[Felipe Contreras]

Phil Pennock wrote:
> The bash completion pulled into zsh was being pulled in _as_ zsh, but
> used patterns which relied on falling through as unhandled.  In zsh
> 5.0.3 this no longer works, resulting in:
> 
>     __git_complete_remote_or_refspec:33: bad pattern: +*
> 
> Fix by telling zsh to emulate sh while sourcing the bash config file,
> which stickily preserves compatibility options in the function context.
> This usage of "emulate" came in with zsh 4.3.10, released 2009-06-01.

I'm using 5.9.5 and I don't see any issue. Howe exactly have you
configured this script?

> Signed-off-by: Phil Pennock <pdp@spodhuis.org>
> ---
> nb: I am not on the git mailing-list, please keep me CC'd.

No need to say that. This is a sane mailing list with doesn't do
reply-to munging[1], so you are Cc'ed by default, in essentially al
MUA's out there.

[1] http://felipec.wordpress.com/2010/08/03/avoid-reply-to-munging-mail-as-mail-was-meant-to-be/

-- 
Felipe Contreras

RE: [PATCH] zsh completion: 5.0.3 compat, use emulate

[Felipe Contreras]

Felipe Contreras wrote:
> Phil Pennock wrote:
> > The bash completion pulled into zsh was being pulled in _as_ zsh, but
> > used patterns which relied on falling through as unhandled.  In zsh
> > 5.0.3 this no longer works, resulting in:
> > 
> >     __git_complete_remote_or_refspec:33: bad pattern: +*
> > 
> > Fix by telling zsh to emulate sh while sourcing the bash config file,
> > which stickily preserves compatibility options in the function context.
> > This usage of "emulate" came in with zsh 4.3.10, released 2009-06-01.
> 
> I'm using 5.9.5 and I don't see any issue. Howe exactly have you
> configured this script?

I meant 5.0.5.

Anyway, I've tried with multiple versions of zsh and I'm able to
reproduce the issue by doing 'git push origin <tab>'. However, it seems
the issue was instroduced in 5.0.3, and fixed in 5.0.4, so I don't think
we should do anything on our side.

-- 
Felipe Contreras

Re: [PATCH] zsh completion: 5.0.3 compat, use emulate

[Phil Pennock]

On 2014-04-30 at 05:00 -0500, Felipe Contreras wrote:
> Felipe Contreras wrote:
> > Phil Pennock wrote:
> > > The bash completion pulled into zsh was being pulled in _as_ zsh, but
> > > used patterns which relied on falling through as unhandled.  In zsh
> > > 5.0.3 this no longer works, resulting in:
> > > 
> > >     __git_complete_remote_or_refspec:33: bad pattern: +*
> > > 
> > > Fix by telling zsh to emulate sh while sourcing the bash config file,
> > > which stickily preserves compatibility options in the function context.
> > > This usage of "emulate" came in with zsh 4.3.10, released 2009-06-01.
> > 
> > I'm using 5.9.5 and I don't see any issue. Howe exactly have you
> > configured this script?
> 
> I meant 5.0.5.
> 
> Anyway, I've tried with multiple versions of zsh and I'm able to
> reproduce the issue by doing 'git push origin <tab>'. However, it seems
> the issue was instroduced in 5.0.3, and fixed in 5.0.4, so I don't think
> we should do anything on our side.

Correct: it was considered a regression and after I mailed the git list,
zsh changed the behaviour and put out 5.0.4 fairly shortly thereafter.
I don't think that 5.0.3 has taken root anywhere, so you should be good.

-Phil