{"thread":{"id":"33749","subject":"[PATCH 0/2] completion: zsh wrapper cleanups","startedAt":"2013-05-08T07:36:59Z","lastAt":"2013-05-08T07:37:01Z","messageCount":3,"participants":["Felipe Contreras"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"216686","messageId":"1367998621-12582-1-git-send-email-felipe.contreras@gmail.com","threadId":"33749","inReplyTo":null,"subject":"[PATCH 0/2] completion: zsh wrapper cleanups","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-05-08T07:36:59Z","receivedAt":"2013-05-08T07:36:59Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Hi,\n\nNothing fancy, just some cleanups for the minimal zsh backup wrapper in bash's\ncompletion code.\n\nFelipe Contreras (2):\n  completion: cleanup zsh wrapper\n  completion: synchronize zsh wrapper\n\n contrib/completion/git-completion.bash | 22 +++++++---------------\n 1 file changed, 7 insertions(+), 15 deletions(-)\n\n-- \n1.8.3.rc1.553.gac13664\n"},{"id":"216687","messageId":"1367998621-12582-2-git-send-email-felipe.contreras@gmail.com","threadId":"33749","inReplyTo":"1367998621-12582-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 1/2] completion: cleanup zsh wrapper","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-05-08T07:37:00Z","receivedAt":"2013-05-08T07:37:00Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"There's no need for a separate function; we can call\n'emulate -k ksh func'.\n\nSigned-off-by: Felipe Contreras <felipe.contreras@gmail.com>\n---\n contrib/completion/git-completion.bash | 18 +++++-------------\n 1 file changed, 5 insertions(+), 13 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex b97162f..84dbf19 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -2689,21 +2689,13 @@ if [[ -n ${ZSH_VERSION-} ]]; then\n \t\tcompadd -Q -p \"${2-}\" -f -- ${=1} && _ret=0\n \t}\n \n-\t__git_zsh_helper ()\n-\t{\n-\t\temulate -L ksh\n-\t\tlocal cur cword prev\n-\t\tcur=${words[CURRENT-1]}\n-\t\tprev=${words[CURRENT-2]}\n-\t\tlet cword=CURRENT-1\n-\t\t__${service}_main\n-\t}\n-\n \t_git ()\n \t{\n-\t\temulate -L zsh\n-\t\tlocal _ret=1\n-\t\t__git_zsh_helper\n+\t\tlocal _ret=1 cur cword prev\n+\t\tcur=${words[CURRENT]}\n+\t\tprev=${words[CURRENT-1]}\n+\t\tlet cword=CURRENT-1\n+\t\temulate ksh -c __${service}_main\n \t\tlet _ret && _default -S '' && _ret=0\n \t\treturn _ret\n \t}\n-- \n1.8.3.rc1.553.gac13664\n"},{"id":"216688","messageId":"1367998621-12582-3-git-send-email-felipe.contreras@gmail.com","threadId":"33749","inReplyTo":"1367998621-12582-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 2/2] completion: synchronize zsh wrapper","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-05-08T07:37:01Z","receivedAt":"2013-05-08T07:37:01Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"So it's closer to the full zsh wrapper.\n\nSigned-off-by: Felipe Contreras <felipe.contreras@gmail.com>\n---\n contrib/completion/git-completion.bash | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 84dbf19..b61f6c2 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -2663,7 +2663,7 @@ if [[ -n ${ZSH_VERSION-} ]]; then\n \t\t\t\t--*=*|*.) ;;\n \t\t\t\t*) c=\"$c \" ;;\n \t\t\t\tesac\n-\t\t\t\tarray[$#array+1]=\"$c\"\n+\t\t\t\tarray+=(\"$c\")\n \t\t\tdone\n \t\t\tcompset -P '*[=:]'\n \t\t\tcompadd -Q -S '' -p \"${2-}\" -a -- array && _ret=0\n@@ -2696,7 +2696,7 @@ if [[ -n ${ZSH_VERSION-} ]]; then\n \t\tprev=${words[CURRENT-1]}\n \t\tlet cword=CURRENT-1\n \t\temulate ksh -c __${service}_main\n-\t\tlet _ret && _default -S '' && _ret=0\n+\t\tlet _ret && _default && _ret=0\n \t\treturn _ret\n \t}\n \n-- \n1.8.3.rc1.553.gac13664\n"}]}