{"thread":{"id":"52012","subject":"[PATCH 0/1] doc: Add a note about ~/.zsh/_git file","startedAt":"2019-10-10T16:56:56Z","lastAt":"2020-10-25T03:40:19Z","messageCount":13,"participants":["Max Belsky via GitGitGadget","Maxim Belsky via GitGitGadget","Johannes Schindelin","Junio C Hamano","SZEDER Gábor","Felipe Contreras"],"isPatch":true,"patchVersion":1,"patchTotal":1},"messages":[{"id":"383817","messageId":"pull.367.git.gitgitgadget@gmail.com","threadId":"52012","inReplyTo":null,"subject":"[PATCH 0/1] doc: Add a note about ~/.zsh/_git file","fromName":"Max Belsky via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-10-10T16:56:52Z","receivedAt":"2019-10-10T16:56:56Z","isPatch":true,"sender":{"key":"name:Max Belsky","avatar":null},"body":"Hey,\n\nToday I've spent a few hours to understand why git-completion doesn't work\nin my zsh shell. It was because I thought ~/.zsh/_git should be a dictionary\nwith git-completion.zsh file. \n\nI think this change may save some hours for someone else.\n\nMaxim Belsky (1):\n  doc: Change zsh git completion file name\n\n contrib/completion/git-completion.zsh | 5 +++--\n 1 file changed, 3 insertions(+), 2 deletions(-)\n\n\nbase-commit: 4c86140027f4a0d2caaa3ab4bd8bfc5ce3c11c8a\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-367%2Fmbelsky%2Fpatch-1-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-367/mbelsky/patch-1-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/367\n-- \ngitgitgadget\n"},{"id":"383818","messageId":"ae00e1e3932b3364da68fa66e2ec5fbcce124bdc.1570726611.git.gitgitgadget@gmail.com","threadId":"52012","inReplyTo":"pull.367.git.gitgitgadget@gmail.com","subject":"[PATCH 1/1] doc: Change zsh git completion file name","fromName":"Maxim Belsky via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-10-10T16:56:53Z","receivedAt":"2019-10-10T16:56:57Z","isPatch":true,"sender":{"key":"public.belsky@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3923527?v=4"},"body":"From: Maxim Belsky <public.belsky@gmail.com>\n\nSigned-off-by: Maxim Belsky <public.belsky@gmail.com>\n---\n contrib/completion/git-completion.zsh | 5 +++--\n 1 file changed, 3 insertions(+), 2 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh\nindex 886bf95d1f..c0eca3ff25 100644\n--- a/contrib/completion/git-completion.zsh\n+++ b/contrib/completion/git-completion.zsh\n@@ -11,8 +11,9 @@\n #\n #  zstyle ':completion:*:*:git:*' script ~/.git-completion.zsh\n #\n-# The recommended way to install this script is to copy to '~/.zsh/_git', and\n-# then add the following to your ~/.zshrc file:\n+# The recommended way to install this script is to copy to\n+# '~/.zsh/.git-completion.zsh', and then add the following to your ~/.zshrc\n+# file:\n #\n #  fpath=(~/.zsh $fpath)\n \n-- \ngitgitgadget\n"},{"id":"383839","messageId":"nycvar.QRO.7.76.6.1910102310260.46@tvgsbejvaqbjf.bet","threadId":"52012","inReplyTo":"ae00e1e3932b3364da68fa66e2ec5fbcce124bdc.1570726611.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 1/1] doc: Change zsh git completion file name","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2019-10-10T21:12:41Z","receivedAt":"2019-10-10T21:13:05Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Maxim,\n\n\nOn Thu, 10 Oct 2019, Maxim Belsky via GitGitGadget wrote:\n\n> From: Maxim Belsky <public.belsky@gmail.com>\n>\n> Signed-off-by: Maxim Belsky <public.belsky@gmail.com>\n\nI totally agree with the patch, but only because I read a couple of\nreports that users were struggling with this. Maybe add a couple of\nreference points to the commit message, to describe how easy it is to\nmiss the fact that it needs to be a _file_, not a directory, and also\ndescribe how `zsh` tells you that there is a problem (even if it does\nnot report a problem, that's a valuable piece of information for the\ncommit message).\n\nThanks,\nJohannes\n> ---\n>  contrib/completion/git-completion.zsh | 5 +++--\n>  1 file changed, 3 insertions(+), 2 deletions(-)\n>\n> diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh\n> index 886bf95d1f..c0eca3ff25 100644\n> --- a/contrib/completion/git-completion.zsh\n> +++ b/contrib/completion/git-completion.zsh\n> @@ -11,8 +11,9 @@\n>  #\n>  #  zstyle ':completion:*:*:git:*' script ~/.git-completion.zsh\n>  #\n> -# The recommended way to install this script is to copy to '~/.zsh/_git', and\n> -# then add the following to your ~/.zshrc file:\n> +# The recommended way to install this script is to copy to\n> +# '~/.zsh/.git-completion.zsh', and then add the following to your ~/.zshrc\n> +# file:\n>  #\n>  #  fpath=(~/.zsh $fpath)\n>\n> --\n> gitgitgadget\n>\n"},{"id":"383871","messageId":"xmqqmue7hlih.fsf@gitster-ct.c.googlers.com","threadId":"52012","inReplyTo":"nycvar.QRO.7.76.6.1910102310260.46@tvgsbejvaqbjf.bet","subject":"Re: [PATCH 1/1] doc: Change zsh git completion file name","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-10-11T05:57:42Z","receivedAt":"2019-10-11T05:57:53Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:\n\n> On Thu, 10 Oct 2019, Maxim Belsky via GitGitGadget wrote:\n>\n>> From: Maxim Belsky <public.belsky@gmail.com>\n>>\n>> Signed-off-by: Maxim Belsky <public.belsky@gmail.com>\n>\n> I totally agree with the patch, but only because I read a couple of\n> reports that users were struggling with this. Maybe add a couple of\n> reference points to the commit message, to describe how easy it is to\n> miss the fact that it needs to be a _file_, not a directory, and also\n> describe how `zsh` tells you that there is a problem (even if it does\n> not report a problem, that's a valuable piece of information for the\n> commit message).\n\nAfter reading the updated text, and then hearing many people cannot\nget if the existing reference to ~/.zsh/_git is about a directory\n(to which this should be added as one of the files in it) or a file,\nI doubt that the updated text is clear enough for these people.\n\n>> -# The recommended way to install this script is to copy to '~/.zsh/_git', and\n>> -# then add the following to your ~/.zshrc file:\n>> +# The recommended way to install this script is to copy to\n>> +# '~/.zsh/.git-completion.zsh', and then add the following to your ~/.zshrc\n>> +# file:\n\nPerhaps making it absolutely clear by risking to be overly verbose,\nlike so?\n\n    The recommended way to install this script is to make a copy of it\n    in ~/.zsh/ directory as ~/.zsh/git-completion.zsh and then ...\n\nIf my attempt to be overly verbose and absolutely clear above is\ngiving a wrong piece of advice, then that would be an indication\nthat the original nor the updated text is clear enough, as they are\nthe primary sources of information on this matter I used to come up\nwith the suggestion ;-)\n\n>>  #\n>>  #  fpath=(~/.zsh $fpath)\n>>\n>> --\n>> gitgitgadget\n>>\n"},{"id":"383910","messageId":"pull.367.v2.git.gitgitgadget@gmail.com","threadId":"52012","inReplyTo":"pull.367.git.gitgitgadget@gmail.com","subject":"[PATCH v2 0/1] doc: Add a note about ~/.zsh/_git file","fromName":"Max Belsky via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-10-11T17:54:27Z","receivedAt":"2019-10-11T17:54:31Z","isPatch":true,"sender":{"key":"name:Max Belsky","avatar":null},"body":"Hey,\n\nToday I've spent a few hours to understand why git-completion doesn't work\nin my zsh shell. It was because I thought ~/.zsh/_git should be a dictionary\nwith git-completion.zsh file. \n\nI think this change may save some hours for someone else.\n\nMaxim Belsky (1):\n  doc: Change zsh git completion file name\n\n contrib/completion/git-completion.zsh | 5 +++--\n 1 file changed, 3 insertions(+), 2 deletions(-)\n\n\nbase-commit: 4c86140027f4a0d2caaa3ab4bd8bfc5ce3c11c8a\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-367%2Fmbelsky%2Fpatch-1-v2\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-367/mbelsky/patch-1-v2\nPull-Request: https://github.com/gitgitgadget/git/pull/367\n\nRange-diff vs v1:\n\n 1:  ae00e1e393 ! 1:  3f994f3b9a doc: Change zsh git completion file name\n     @@ -2,7 +2,15 @@\n      \n          doc: Change zsh git completion file name\n      \n     +    The original comment does not describe type of ~/.zsh/_git explicitly\n     +    and zsh does not warn or fail if a user create it as a dictionary.\n     +    So unexperienced users could be misled by the original comment.\n     +\n     +    There is a small update to clarify it.\n     +\n          Signed-off-by: Maxim Belsky <public.belsky@gmail.com>\n     +    Helped-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>\n     +    Helped-by: Junio C Hamano <gitster@pobox.com>\n      \n       diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh\n       --- a/contrib/completion/git-completion.zsh\n     @@ -13,9 +21,9 @@\n       #\n      -# The recommended way to install this script is to copy to '~/.zsh/_git', and\n      -# then add the following to your ~/.zshrc file:\n     -+# The recommended way to install this script is to copy to\n     -+# '~/.zsh/.git-completion.zsh', and then add the following to your ~/.zshrc\n     -+# file:\n     ++# The recommended way to install this script is to make a copy of it in\n     ++# ~/.zsh/ directory as ~/.zsh/git-completion.zsh and then add the following\n     ++# to your ~/.zshrc file:\n       #\n       #  fpath=(~/.zsh $fpath)\n       \n\n-- \ngitgitgadget\n"},{"id":"383911","messageId":"3f994f3b9a49c42bb8b605459817e54479327dc7.1570816467.git.gitgitgadget@gmail.com","threadId":"52012","inReplyTo":"pull.367.v2.git.gitgitgadget@gmail.com","subject":"[PATCH v2 1/1] doc: Change zsh git completion file name","fromName":"Maxim Belsky via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-10-11T17:54:28Z","receivedAt":"2019-10-11T17:54:34Z","isPatch":true,"sender":{"key":"public.belsky@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3923527?v=4"},"body":"From: Maxim Belsky <public.belsky@gmail.com>\n\nThe original comment does not describe type of ~/.zsh/_git explicitly\nand zsh does not warn or fail if a user create it as a dictionary.\nSo unexperienced users could be misled by the original comment.\n\nThere is a small update to clarify it.\n\nSigned-off-by: Maxim Belsky <public.belsky@gmail.com>\nHelped-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>\nHelped-by: Junio C Hamano <gitster@pobox.com>\n---\n contrib/completion/git-completion.zsh | 5 +++--\n 1 file changed, 3 insertions(+), 2 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh\nindex 886bf95d1f..eef4eff53d 100644\n--- a/contrib/completion/git-completion.zsh\n+++ b/contrib/completion/git-completion.zsh\n@@ -11,8 +11,9 @@\n #\n #  zstyle ':completion:*:*:git:*' script ~/.git-completion.zsh\n #\n-# The recommended way to install this script is to copy to '~/.zsh/_git', and\n-# then add the following to your ~/.zshrc file:\n+# The recommended way to install this script is to make a copy of it in\n+# ~/.zsh/ directory as ~/.zsh/git-completion.zsh and then add the following\n+# to your ~/.zshrc file:\n #\n #  fpath=(~/.zsh $fpath)\n \n-- \ngitgitgadget\n"},{"id":"383959","messageId":"xmqqwodaeoee.fsf@gitster-ct.c.googlers.com","threadId":"52012","inReplyTo":"3f994f3b9a49c42bb8b605459817e54479327dc7.1570816467.git.gitgitgadget@gmail.com","subject":"Re: [PATCH v2 1/1] doc: Change zsh git completion file name","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-10-12T01:35:53Z","receivedAt":"2019-10-12T01:36:01Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Maxim Belsky via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n\n> Signed-off-by: Maxim Belsky <public.belsky@gmail.com>\n> Helped-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>\n> Helped-by: Junio C Hamano <gitster@pobox.com>\n\nNo need to resend (as I'll fix it up locally while queuing), but\nyour sign-off comes last, as we keep these things chronological.\nWith help from others, you wrote the patch and finally signed it off\nto be applied.\n\nThanks for working on this.\n"},{"id":"384046","messageId":"20191014234439.GT29845@szeder.dev","threadId":"52012","inReplyTo":"3f994f3b9a49c42bb8b605459817e54479327dc7.1570816467.git.gitgitgadget@gmail.com","subject":"Re: [PATCH v2 1/1] doc: Change zsh git completion file name","fromName":"SZEDER Gábor","fromEmail":"szeder.dev@gmail.com","sentAt":"2019-10-14T23:44:39Z","receivedAt":"2019-10-14T23:44:47Z","isPatch":true,"sender":{"key":"szeder.dev@gmail.com","avatar":"https://avatars.githubusercontent.com/u/116324?v=4"},"body":"On Fri, Oct 11, 2019 at 10:54:28AM -0700, Maxim Belsky via GitGitGadget wrote:\n> From: Maxim Belsky <public.belsky@gmail.com>\n> \n> The original comment does not describe type of ~/.zsh/_git explicitly\n> and zsh does not warn or fail if a user create it as a dictionary.\n> So unexperienced users could be misled by the original comment.\n> \n> There is a small update to clarify it.\n> \n> Signed-off-by: Maxim Belsky <public.belsky@gmail.com>\n> Helped-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>\n> Helped-by: Junio C Hamano <gitster@pobox.com>\n> ---\n>  contrib/completion/git-completion.zsh | 5 +++--\n>  1 file changed, 3 insertions(+), 2 deletions(-)\n> \n> diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh\n> index 886bf95d1f..eef4eff53d 100644\n> --- a/contrib/completion/git-completion.zsh\n> +++ b/contrib/completion/git-completion.zsh\n> @@ -11,8 +11,9 @@\n>  #\n>  #  zstyle ':completion:*:*:git:*' script ~/.git-completion.zsh\n>  #\n> -# The recommended way to install this script is to copy to '~/.zsh/_git', and\n> -# then add the following to your ~/.zshrc file:\n> +# The recommended way to install this script is to make a copy of it in\n> +# ~/.zsh/ directory as ~/.zsh/git-completion.zsh and then add the following\n\nThese updated instructions don't work for me, following them gives me\nzsh's git completion instead of ours:\n\n  $ ls -l /etc/bash_completion.d/git\n  -rwxr-xr-x 1 root root 72165 Oct 15 01:27 /etc/bash_completion.d/git\n  $ ls -l ~/.zsh/\n  total 8\n  -rw-r--r-- 1 szeder szeder 6013 Oct 15 01:27 git-completion.zsh\n  $ cat ~/.zshrc \n  # Use modern completion system\n  autoload -Uz compinit\n  compinit\n  \n  fpath=(~/.zsh $fpath)\n  $ zsh\n  % git init --<TAB>\n  --bare              -- create a bare repository\n  --quiet             -- do not print any results to stdout\n  --separate-git-dir  -- create git dir elsewhere and link it using the gitdir\n  --shared            -- share repository amongst several users\n  --template          -- directory to use as a template for the object databas\n\nThat's clearly zsh's fancy completion.\n\nAs a non-zsh user I had the impression that it's a well-established\nconvention that the completion script of a command for zsh is called\n'_command', see e.g. all the scripts in:\n\n  https://github.com/zsh-users/zsh-completions/tree/master/src\n\nInstructing users to copy our completion script to\n'~/.zsh/git-completion.zsh' goes against this convention.\n\nMore importantly, it appears that this is more than a mere convention,\nmaybe a requirement even; at least renaming our zsh completion script\nto follow the convention (IOW following the current install\ninstructions) makes it work all of a sudden:\n\n  $ mv .zsh/git-completion.zsh .zsh/_git\n  $ zsh\n  % git init --\n  --                      --no-separate-git-dir   --shared \n  --bare                  --no-template           --template=\n  --no-bare               --quiet                 \n  --no-quiet              --separate-git-dir=     \n\nNow that's our Bash completion script used by zsh.\n\n"},{"id":"384057","messageId":"xmqqimoqdann.fsf@gitster-ct.c.googlers.com","threadId":"52012","inReplyTo":"20191014234439.GT29845@szeder.dev","subject":"Re: [PATCH v2 1/1] doc: Change zsh git completion file name","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-10-15T02:07:08Z","receivedAt":"2019-10-15T02:09:13Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"SZEDER Gábor <szeder.dev@gmail.com> writes:\n\n>> -# The recommended way to install this script is to copy to '~/.zsh/_git', and\n>> -# then add the following to your ~/.zshrc file:\n>> +# The recommended way to install this script is to make a copy of it in\n>> +# ~/.zsh/ directory as ~/.zsh/git-completion.zsh and then add the following\n>\n> These updated instructions don't work for me, following them gives me\n> zsh's git completion instead of ours:\n> ...\n> Instructing users to copy our completion script to\n> '~/.zsh/git-completion.zsh' goes against this convention.\n> More importantly, it appears that this is more than a mere convention,\n> maybe a requirement even; at least renaming our zsh completion script\n> to follow the convention (IOW following the current install\n> instructions) makes it work all of a sudden:\n\nThanks for a dose of sanity.  My \"Helped-by\" was about phrasing and\nhad nothing with the name of the file, so it should be fixable\nwithout invalidating it ;-)\n\n> -# The recommended way to install this script is to copy to '~/.zsh/_git', and\n> -# then add the following to your ~/.zshrc file:\n> +# The recommended way to install this script is to make a copy of it in\n> +# ~/.zsh/ directory as ~/.zsh/git-completion.zsh and then add the following\n\n    # The recommended way to install this script is to make a copy of it in\n    # '~/.zsh/' directory as '~/.zsh/_git' and then add the following\n\n"},{"id":"384114","messageId":"pull.367.v3.git.1571165293.gitgitgadget@gmail.com","threadId":"52012","inReplyTo":"pull.367.v2.git.gitgitgadget@gmail.com","subject":"[PATCH v3 0/1] doc: Add a note about ~/.zsh/_git file","fromName":"Max Belsky via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-10-15T18:48:12Z","receivedAt":"2019-10-15T18:48:20Z","isPatch":true,"sender":{"key":"name:Max Belsky","avatar":null},"body":"Hey,\n\nToday I've spent a few hours to understand why git-completion doesn't work\nin my zsh shell. It was because I thought ~/.zsh/_git should be a dictionary\nwith git-completion.zsh file. \n\nI think this change may save some hours for someone else.\n\nMaxim Belsky (1):\n  doc: Change zsh git completion file name\n\n contrib/completion/git-completion.zsh | 5 +++--\n 1 file changed, 3 insertions(+), 2 deletions(-)\n\n\nbase-commit: 108b97dc372828f0e72e56bbb40cae8e1e83ece6\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-367%2Fmbelsky%2Fpatch-1-v3\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-367/mbelsky/patch-1-v3\nPull-Request: https://github.com/gitgitgadget/git/pull/367\n\nRange-diff vs v2:\n\n 1:  3f994f3b9a ! 1:  7919addea8 doc: Change zsh git completion file name\n     @@ -8,9 +8,10 @@\n      \n          There is a small update to clarify it.\n      \n     -    Signed-off-by: Maxim Belsky <public.belsky@gmail.com>\n          Helped-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>\n          Helped-by: Junio C Hamano <gitster@pobox.com>\n     +    Helped-by: SZEDER Gábor <szeder.dev@gmail.com>\n     +    Signed-off-by: Maxim Belsky <public.belsky@gmail.com>\n      \n       diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh\n       --- a/contrib/completion/git-completion.zsh\n     @@ -22,8 +23,8 @@\n      -# The recommended way to install this script is to copy to '~/.zsh/_git', and\n      -# then add the following to your ~/.zshrc file:\n      +# The recommended way to install this script is to make a copy of it in\n     -+# ~/.zsh/ directory as ~/.zsh/git-completion.zsh and then add the following\n     -+# to your ~/.zshrc file:\n     ++# '~/.zsh/' directory as '~/.zsh/_git' and then add the following to your\n     ++# ~/.zshrc file:\n       #\n       #  fpath=(~/.zsh $fpath)\n       \n\n-- \ngitgitgadget\n"},{"id":"384115","messageId":"7919addea85597c3c910a09cbc1d931c6f71c544.1571165293.git.gitgitgadget@gmail.com","threadId":"52012","inReplyTo":"pull.367.v3.git.1571165293.gitgitgadget@gmail.com","subject":"[PATCH v3 1/1] doc: Change zsh git completion file name","fromName":"Maxim Belsky via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-10-15T18:48:13Z","receivedAt":"2019-10-15T18:48:20Z","isPatch":true,"sender":{"key":"public.belsky@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3923527?v=4"},"body":"From: Maxim Belsky <public.belsky@gmail.com>\n\nThe original comment does not describe type of ~/.zsh/_git explicitly\nand zsh does not warn or fail if a user create it as a dictionary.\nSo unexperienced users could be misled by the original comment.\n\nThere is a small update to clarify it.\n\nHelped-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>\nHelped-by: Junio C Hamano <gitster@pobox.com>\nHelped-by: SZEDER Gábor <szeder.dev@gmail.com>\nSigned-off-by: Maxim Belsky <public.belsky@gmail.com>\n---\n contrib/completion/git-completion.zsh | 5 +++--\n 1 file changed, 3 insertions(+), 2 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh\nindex 886bf95d1f..b480e3f316 100644\n--- a/contrib/completion/git-completion.zsh\n+++ b/contrib/completion/git-completion.zsh\n@@ -11,8 +11,9 @@\n #\n #  zstyle ':completion:*:*:git:*' script ~/.git-completion.zsh\n #\n-# The recommended way to install this script is to copy to '~/.zsh/_git', and\n-# then add the following to your ~/.zshrc file:\n+# The recommended way to install this script is to make a copy of it in\n+# '~/.zsh/' directory as '~/.zsh/_git' and then add the following to your\n+# ~/.zshrc file:\n #\n #  fpath=(~/.zsh $fpath)\n \n-- \ngitgitgadget\n"},{"id":"384153","messageId":"xmqqlftla1gv.fsf@gitster-ct.c.googlers.com","threadId":"52012","inReplyTo":"7919addea85597c3c910a09cbc1d931c6f71c544.1571165293.git.gitgitgadget@gmail.com","subject":"Re: [PATCH v3 1/1] doc: Change zsh git completion file name","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-10-16T02:06:08Z","receivedAt":"2019-10-16T02:06:16Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Maxim Belsky via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n\n> From: Maxim Belsky <public.belsky@gmail.com>\n> Subject: Re: [PATCH v3 1/1] doc: Change zsh git completion file name\n\nLack of attention to the detail.  This is not about changing the\nfilename anymore.\n\n    Subject: [PATCH v3] completion: clarify installation instruction for zsh\n\nperhaps.  I'll make the change locally, so unless there are other\nchanges you want to make, there is no need to resend.\n\nThanks.\n\n> The original comment does not describe type of ~/.zsh/_git explicitly\n> and zsh does not warn or fail if a user create it as a dictionary.\n> So unexperienced users could be misled by the original comment.\n>\n> There is a small update to clarify it.\n>\n> Helped-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>\n> Helped-by: Junio C Hamano <gitster@pobox.com>\n> Helped-by: SZEDER Gábor <szeder.dev@gmail.com>\n> Signed-off-by: Maxim Belsky <public.belsky@gmail.com>\n> ---\n>  contrib/completion/git-completion.zsh | 5 +++--\n>  1 file changed, 3 insertions(+), 2 deletions(-)\n>\n> diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh\n> index 886bf95d1f..b480e3f316 100644\n> --- a/contrib/completion/git-completion.zsh\n> +++ b/contrib/completion/git-completion.zsh\n> @@ -11,8 +11,9 @@\n>  #\n>  #  zstyle ':completion:*:*:git:*' script ~/.git-completion.zsh\n>  #\n> -# The recommended way to install this script is to copy to '~/.zsh/_git', and\n> -# then add the following to your ~/.zshrc file:\n> +# The recommended way to install this script is to make a copy of it in\n> +# '~/.zsh/' directory as '~/.zsh/_git' and then add the following to your\n> +# ~/.zshrc file:\n>  #\n>  #  fpath=(~/.zsh $fpath)\n"},{"id":"408338","messageId":"CAMP44s3UA-eVGJ1fwYwQCaJEKaD4MzDWds311bhdNPb1WFy01A@mail.gmail.com","threadId":"52012","inReplyTo":"20191014234439.GT29845@szeder.dev","subject":"Re: [PATCH v2 1/1] doc: Change zsh git completion file name","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2020-10-25T03:40:05Z","receivedAt":"2020-10-25T03:40:19Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Tue, Oct 15, 2019 at 3:22 AM SZEDER Gábor <szeder.dev@gmail.com> wrote:\n\n> Instructing users to copy our completion script to\n> '~/.zsh/git-completion.zsh' goes against this convention.\n>\n> More importantly, it appears that this is more than a mere convention,\n> maybe a requirement even; at least renaming our zsh completion script\n> to follow the convention (IOW following the current install\n> instructions) makes it work all of a sudden:\n\nIt is a requirement. If the file is not named '_git' it will never be\nautoloaded. The whole point of naming it that way is that it's loaded\nafter typing 'git<tab>'.\n\n-- \nFelipe Contreras\n"}]}