From: Junio C Hamano <gitster@pobox.com>
To: "SZEDER Gábor" <szeder.dev@gmail.com>
Cc: Git <git@vger.kernel.org>, Felipe Contreras <felipe.contreras@gmail.com>
Subject: Re: [PATCH] completion: bash: fix gitk alias regression
Date: Mon, 07 Dec 2020 13:44:35 -0800 [thread overview]
Message-ID: <xmqqk0tt8f5o.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <CAMP44s0xdkG5P_QHasQZbM3wNf3H99ZWCKB4qgP0Xdigpo7aoQ@mail.gmail.com> (Felipe Contreras's message of "Sat, 5 Dec 2020 01:12:42 -0600")
Felipe Contreras <felipe.contreras@gmail.com> writes:
> On Sat, Dec 5, 2020 at 1:10 AM Felipe Contreras
> <felipe.contreras@gmail.com> wrote:
>>
>> Long time ago when the _git_complete helper was introduced, _gitk was
>> replaced with __gitk_main, and a placeholder for backwards compatibility
>> pointing to __git_wrap_main_gitk was left in place.
>>
>> When "__git_complete gitk __gitk_main" was called, that created the
>> __git_wrap__gitk_main helper, which is just basically "__git_func_wrap
>> __gitk_main" plus `complete` options.
>>
>> Unfortunately the commit b0a4b2d257 (completion: add support for
>> backwards compatibility, 2012-05-19) missed a previous instance of a
>> call to _gitk in _git_gitk
>>
>> So, basically we had __git_wrap__git_main -> __git_func_wrap __git_main ->
>> __git_complete_command gitk -> _git_gitk -> _gitk ->
>> __git_wrap__gitk_main -> __git_func_wrap __gitk_main -> __gitk_main.
>>
>> There was never any need to call __git_func_wrap twice. Since _git_gitk
>> is always called inside the wrapper, it can call __gitk_main directly.
>>
>> And then, in commit 441ecdab37 (completion: bash: remove old compat
>> wrappers, 2020-10-27) _gitk was removed, which triggers the following
>> error:
>>
>> _git_gitk:9: command not found: _gitk
>>
>> Let's call the correct function: __gitk_main.
>>
>> Cc: SZEDER Gábor <szeder@ira.uka.de>
>
> Hmmm. SZEDER Gábor <szeder.dev@gmail.com>
Thanks.
We've seen two hotfixes including this one on the fc/zsh-completion
topic since it has been pushed down to 'master' for a month or so.
Can somebody give the entire topic a quick eyeballing again (the
range is 1d1c4a8759..af806a2c24) just to be sure?
prev parent reply other threads:[~2020-12-07 21:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-05 7:10 [PATCH] completion: bash: fix gitk alias regression Felipe Contreras
2020-12-05 7:12 ` Felipe Contreras
2020-12-07 21:44 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqk0tt8f5o.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=szeder.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).