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@xxxxxxxxx> wrote:
> >
> > On Thu, Aug 1, 2019 at 8:50 PM Max Rothman <max.r.rothman@xxxxxxxxx> 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@xxxxxxxxx>
> > > ---
> > > 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
> > >
>
