git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jacob Keller <jacob.keller@gmail.com>
Cc: "Ákos Uzonyi" <uzonyi.akos@gmail.com>,
	"Git mailing list" <git@vger.kernel.org>,
	"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
	"Thomas Braun" <thomas.braun@virtuell-zuhause.de>
Subject: Re: [PATCH v2 1/2] completion: use "prev" variable instead of introducing "prevword"
Date: Sat, 26 Sep 2020 15:31:53 -0700	[thread overview]
Message-ID: <xmqqpn68i2zq.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <CA+P7+xrBcKpDgFfDyp8=f_AaqqcVzjo3MV38=6geJ6bavZSTDw@mail.gmail.com> (Jacob Keller's message of "Fri, 25 Sep 2020 15:53:53 -0700")

Jacob Keller <jacob.keller@gmail.com> writes:

> On Fri, Sep 25, 2020 at 3:00 PM Ákos Uzonyi <uzonyi.akos@gmail.com> wrote:
>>
>> In both _git_checkout and _git_switch a new "prevword" variable were
>> introduced, however the "prev" variable already contains the last word.
>>
>> The "prevword" variable is replaced with "prev", and the case is moved
>> to the beginning of the function, like it's done in many other places
>> (e.g. _git_commit). Also the indentaion of the case is fixed.
>>
>
> Ahhh... didn't realize $prev existed.

Yup, makes a lot of sense.

Thanks, Ákos.  Will queue.

>
>> Signed-off-by: Ákos Uzonyi <uzonyi.akos@gmail.com>
>> ---
>>  contrib/completion/git-completion.bash | 66 +++++++++++++-------------
>>  1 file changed, 32 insertions(+), 34 deletions(-)
>>
>> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
>> index 8be4a0316e..3d02bd4de7 100644
>> --- a/contrib/completion/git-completion.bash
>> +++ b/contrib/completion/git-completion.bash
>> @@ -1508,6 +1508,22 @@ _git_checkout ()
>>  {
>>         __git_has_doubledash && return
>>
>> +       local dwim_opt="$(__git_checkout_default_dwim_mode)"
>> +
>> +       case "$prev" in
>> +       -b|-B|--orphan)
>> +               # Complete local branches (and DWIM branch
>> +               # remote branch names) for an option argument
>> +               # specifying a new branch name. This is for
>> +               # convenience, assuming new branches are
>> +               # possibly based on pre-existing branch names.
>> +               __git_complete_refs $dwim_opt --mode="heads"
>> +               return
>> +               ;;
>> +       *)
>> +               ;;
>> +       esac
>> +
>>         case "$cur" in
>>         --conflict=*)
>>                 __gitcomp "diff3 merge" "" "${cur##--conflict=}"
>> @@ -1516,23 +1532,6 @@ _git_checkout ()
>>                 __gitcomp_builtin checkout
>>                 ;;
>>         *)
>> -               local dwim_opt="$(__git_checkout_default_dwim_mode)"
>> -               local prevword prevword="${words[cword-1]}"
>> -
>> -               case "$prevword" in
>> -                       -b|-B|--orphan)
>> -                               # Complete local branches (and DWIM branch
>> -                               # remote branch names) for an option argument
>> -                               # specifying a new branch name. This is for
>> -                               # convenience, assuming new branches are
>> -                               # possibly based on pre-existing branch names.
>> -                               __git_complete_refs $dwim_opt --mode="heads"
>> -                               return
>> -                               ;;
>> -                       *)
>> -                               ;;
>> -               esac
>> -
>>                 # At this point, we've already handled special completion for
>>                 # the arguments to -b/-B, and --orphan. There are 3 main
>>                 # things left we can possibly complete:
>> @@ -2392,6 +2391,22 @@ _git_status ()
>>
>>  _git_switch ()
>>  {
>> +       local dwim_opt="$(__git_checkout_default_dwim_mode)"
>> +
>> +       case "$prev" in
>> +       -c|-C|--orphan)
>> +               # Complete local branches (and DWIM branch
>> +               # remote branch names) for an option argument
>> +               # specifying a new branch name. This is for
>> +               # convenience, assuming new branches are
>> +               # possibly based on pre-existing branch names.
>> +               __git_complete_refs $dwim_opt --mode="heads"
>> +               return
>> +               ;;
>> +       *)
>> +               ;;
>> +       esac
>> +
>>         case "$cur" in
>>         --conflict=*)
>>                 __gitcomp "diff3 merge" "" "${cur##--conflict=}"
>> @@ -2400,23 +2415,6 @@ _git_switch ()
>>                 __gitcomp_builtin switch
>>                 ;;
>>         *)
>> -               local dwim_opt="$(__git_checkout_default_dwim_mode)"
>> -               local prevword prevword="${words[cword-1]}"
>> -
>> -               case "$prevword" in
>> -                       -c|-C|--orphan)
>> -                               # Complete local branches (and DWIM branch
>> -                               # remote branch names) for an option argument
>> -                               # specifying a new branch name. This is for
>> -                               # convenience, assuming new branches are
>> -                               # possibly based on pre-existing branch names.
>> -                               __git_complete_refs $dwim_opt --mode="heads"
>> -                               return
>> -                               ;;
>> -                       *)
>> -                               ;;
>> -               esac
>> -
>>                 # Unlike in git checkout, git switch --orphan does not take
>>                 # a start point. Thus we really have nothing to complete after
>>                 # the branch name.
>> --
>> 2.28.0
>>

      reply	other threads:[~2020-09-26 22:32 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-25 21:11 [PATCH v2 1/2] completion: use "prev" variable instead of introducing "prevword" Ákos Uzonyi
2020-09-25 21:11 ` [PATCH v2 2/2] completion: complete refs after 'git restore -s' Ákos Uzonyi
2020-09-25 22:53 ` [PATCH v2 1/2] completion: use "prev" variable instead of introducing "prevword" Jacob Keller
2020-09-26 22:31   ` 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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqpn68i2zq.fsf@gitster.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=jacob.keller@gmail.com \
    --cc=pclouds@gmail.com \
    --cc=thomas.braun@virtuell-zuhause.de \
    --cc=uzonyi.akos@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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).