{"thread":{"id":"33880","subject":"[PATCH] completion: trivial fix for zsh","startedAt":"2013-05-21T00:33:03Z","lastAt":"2013-05-21T16:28:31Z","messageCount":3,"participants":["Felipe Contreras","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"218024","messageId":"1369096383-28733-1-git-send-email-felipe.contreras@gmail.com","threadId":"33880","inReplyTo":null,"subject":"[PATCH] completion: trivial fix for zsh","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-05-21T00:33:03Z","receivedAt":"2013-05-21T00:33:03Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"zsh completion wrapper doesn't reimplement __gitcompadd(). Although it\nshould be trivial to do that, let's use __gitcomp_nl() which achieves\nexactly the same thing, specially since the suffix ($4) has to be empty.\n\nSigned-off-by: Felipe Contreras <felipe.contreras@gmail.com>\n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex a98c2fd..1c35eef 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1831,7 +1831,7 @@ _git_config ()\n \t\tlocal remote=\"${prev#remote.}\"\n \t\tremote=\"${remote%.fetch}\"\n \t\tif [ -z \"$cur\" ]; then\n-\t\t\t__gitcompadd \"refs/heads/\" \"\" \"\" \"\"\n+\t\t\t__gitcomp_nl \"refs/heads/\" \"\" \"\" \"\"\n \t\t\treturn\n \t\tfi\n \t\t__gitcomp_nl \"$(__git_refs_remotes \"$remote\")\"\n-- \n1.8.3.rc3.286.g3d43083\n"},{"id":"218025","messageId":"CAMP44s04oKBtjnF-+5hjPM+-krZA=m-4=Mb=vzU65GsTNhR3vA@mail.gmail.com","threadId":"33880","inReplyTo":"1369096383-28733-1-git-send-email-felipe.contreras@gmail.com","subject":"Re: [PATCH] completion: trivial fix for zsh","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-05-21T00:38:14Z","receivedAt":"2013-05-21T00:38:14Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Mon, May 20, 2013 at 7:33 PM, Felipe Contreras\n<felipe.contreras@gmail.com> wrote:\n> zsh completion wrapper doesn't reimplement __gitcompadd(). Although it\n> should be trivial to do that, let's use __gitcomp_nl() which achieves\n> exactly the same thing, specially since the suffix ($4) has to be empty.\n>\n> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>\n\nThis is probably v1.8.3 material, I just noticed it's probably a\nregression introduced by 1ce23aa (completion: add new __gitcompadd\nhelper).\n\n-- \nFelipe Contreras\n"},{"id":"218054","messageId":"7vbo84qouo.fsf@alter.siamese.dyndns.org","threadId":"33880","inReplyTo":"CAMP44s04oKBtjnF-+5hjPM+-krZA=m-4=Mb=vzU65GsTNhR3vA@mail.gmail.com","subject":"Re: [PATCH] completion: trivial fix for zsh","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-05-21T16:28:31Z","receivedAt":"2013-05-21T16:28:31Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Felipe Contreras <felipe.contreras@gmail.com> writes:\n\n> On Mon, May 20, 2013 at 7:33 PM, Felipe Contreras\n> <felipe.contreras@gmail.com> wrote:\n>> zsh completion wrapper doesn't reimplement __gitcompadd(). Although it\n>> should be trivial to do that, let's use __gitcomp_nl() which achieves\n>> exactly the same thing, specially since the suffix ($4) has to be empty.\n>>\n>> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>\n>\n> This is probably v1.8.3 material, I just noticed it's probably a\n> regression introduced by 1ce23aa (completion: add new __gitcompadd\n> helper).\n\nGreat.  That is not in v1.8.2.X, but was already in v1.8.3-rc0, so\nwe would need to do something about it.\n\nI am not very happy about the latter \"probably\", though.  If it is a\nregression, at this late in the cycle, it is often safer to revert\nthe original.\n\nWill apply directly to 'master'.  Thanks.\n"}]}