From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Max Rothman <max.r.rothman@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] completion: add missing completions for log, diff, show
Date: Fri, 13 Sep 2019 23:03:42 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1909132300130.47@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <CAFA_24L5S1_AS1OzPYf50iXwEupi0Bus827-NWoUpka-avNo_w@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 5213 bytes --]
Hi Max,
[your reply did not make it to the Git mailing list because it drops
anything with an HTML part]
On Thu, 12 Sep 2019, Max Rothman wrote:
> Great! What’s the path for getting this merged?
Usually it will be picked up into the `pu` branch first, then advance to
`next`, and then to `master`. Once it is in `master`, it will be part of
the then-next official version ending in `.0`.
You can also read about the state of your patch (once it has been picked
up) in the bi-weekly "What's cooking" mails. If you're not subscribed,
you can look at the current version on the web:
https://github.com/git/git/blob/todo/whats-cooking.txt
Ciao,
Johannes
>
> On Thu, Sep 12, 2019 at 4:54 AM Johannes Schindelin <
> Johannes.Schindelin@gmx.de> wrote:
>
> > Hi Max,
> >
> > The patch looks good to me!
> >
> > Thanks,
> > Johannes
> >
> > On Wed, 11 Sep 2019, Max Rothman wrote:
> >
> > > On Thu, Aug 1, 2019 at 8:54 PM Max Rothman <max.r.rothman@gmail.com>
> > wrote:
> > > >
> > > > On Thu, Aug 1, 2019 at 8:50 PM Max Rothman <max.r.rothman@gmail.com>
> > wrote:
> > > > >
> > > > > The bash completion script knows some options to "git log" and
> > > > > "git show" only in the positive form, (e.g. "--abbrev-commit"), but
> > not
> > > > > in their negative form (e.g. "--no-abbrev-commit"). Add them.
> > > > >
> > > > > Also, the bash completion script is missing some other options to
> > > > > "git diff", and "git show" (and thus, all other commands that take
> > > > > "git diff"'s options). Add them. Of note, since "--indent-heuristic"
> > is
> > > > > no longer experimental, add that too.
> > > > >
> > > > > Signed-off-by: Max Rothman <max.r.rothman@gmail.com>
> > > > > ---
> > > > > contrib/completion/git-completion.bash | 18 ++++++++++++++----
> > > > > 1 file changed, 14 insertions(+), 4 deletions(-)
> > > > >
> > > > > diff --git a/contrib/completion/git-completion.bash
> > b/contrib/completion/git-completion.bash
> > > > > index 9f71bcde967bc..b6d18710135ec 100644
> > > > > --- a/contrib/completion/git-completion.bash
> > > > > +++ b/contrib/completion/git-completion.bash
> > > > > @@ -1474,6 +1474,8 @@ __git_diff_common_options="--stat --numstat
> > --shortstat --summary
> > > > > --dirstat-by-file= --cumulative
> > > > > --diff-algorithm=
> > > > > --submodule --submodule= --ignore-submodules
> > > > > + --indent-heuristic --no-indent-heuristic
> > > > > + --textconv --no-textconv
> > > > > "
> > > > >
> > > > > _git_diff ()
> > > > > @@ -1782,6 +1784,10 @@ _git_log ()
> > > > > __gitcomp "$__git_diff_submodule_formats" ""
> > "${cur##--submodule=}"
> > > > > return
> > > > > ;;
> > > > > + --no-walk=*)
> > > > > + __gitcomp "sorted unsorted" "" "${cur##--no-walk=}"
> > > > > + return
> > > > > + ;;
> > > > > --*)
> > > > > __gitcomp "
> > > > > $__git_log_common_options
> > > > > @@ -1789,16 +1795,19 @@ _git_log ()
> > > > > $__git_log_gitk_options
> > > > > --root --topo-order --date-order --reverse
> > > > > --follow --full-diff
> > > > > - --abbrev-commit --abbrev=
> > > > > + --abbrev-commit --no-abbrev-commit --abbrev=
> > > > > --relative-date --date=
> > > > > --pretty= --format= --oneline
> > > > > --show-signature
> > > > > --cherry-mark
> > > > > --cherry-pick
> > > > > --graph
> > > > > - --decorate --decorate=
> > > > > + --decorate --decorate= --no-decorate
> > > > > --walk-reflogs
> > > > > + --no-walk --no-walk= --do-walk
> > > > > --parents --children
> > > > > + --expand-tabs --expand-tabs= --no-expand-tabs
> > > > > + --patch
> > > > > $merge
> > > > > $__git_diff_common_options
> > > > > --pickaxe-all --pickaxe-regex
> > > > > @@ -2525,8 +2534,9 @@ _git_show ()
> > > > > return
> > > > > ;;
> > > > > --*)
> > > > > - __gitcomp "--pretty= --format= --abbrev-commit
> > --oneline
> > > > > - --show-signature
> > > > > + __gitcomp "--pretty= --format= --abbrev-commit
> > --no-abbrev-commit
> > > > > + --oneline --show-signature --patch
> > > > > + --expand-tabs --expand-tabs= --no-expand-tabs
> > > > > $__git_diff_common_options
> > > > > "
> > > > > return
> > > > >
> > > > > --
> > > > > https://github.com/git/git/pull/426
> > > > >
> > >
> >
>
prev parent reply other threads:[~2019-09-13 21:04 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-11 14:47 No log --no-decorate completion? Max Rothman
2017-10-11 18:09 ` Stefan Beller
2017-10-12 17:41 ` Max Rothman
2017-10-24 15:32 ` Max Rothman
[not found] ` <CAFA_24K99LkeJBKV7+a-m-m9PUZik49cOd40+cEn-6zCvGmMsQ@mail.gmail.com>
2017-10-24 15:32 ` Stefan Beller
2017-11-02 20:25 ` Max Rothman
2017-11-02 21:19 ` Stefan Beller
2017-11-07 20:31 ` Max Rothman
2017-11-07 20:48 ` Stefan Beller
2017-11-07 21:22 ` [PATCH] completion: add missing completions for log, diff, show Max Rothman
2017-11-08 2:33 ` Junio C Hamano
2017-11-08 3:30 ` Max Rothman
2017-11-08 4:06 ` Junio C Hamano
2019-07-02 1:56 ` Max Rothman
2019-08-02 0:54 ` Max Rothman
2019-09-11 18:15 ` Max Rothman
2019-09-12 8:54 ` Johannes Schindelin
2019-09-12 19:47 ` Junio C Hamano
[not found] ` <CAFA_24L5S1_AS1OzPYf50iXwEupi0Bus827-NWoUpka-avNo_w@mail.gmail.com>
2019-09-13 21:03 ` Johannes Schindelin [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=nycvar.QRO.7.76.6.1909132300130.47@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=max.r.rothman@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).