On Fri, Jan 27, 2017 at 10:17 PM, <cornelius.weig@xxxxxxxxxxx> wrote:
> From: Cornelius Weig <cornelius.weig@xxxxxxxxxxx>
>
> Recognize several new long-options for bash completion in the following
> commands:
Adding more long options that git commands learn along the way is
always an improvement. However, seeing "_several_ new long options"
(or "some long options" in one of the other patches in the series)
makes the reader wonder: are these the only new long options missing
or are there more? If there are more, why only these are added? If
there aren't any more missing long options left, then please say so,
e.g. "Add all missing long options, except the potentially
desctructive ones, for the following commands: ...."
> - apply: --recount --directory=
> - archive: --output
> - branch: --column --no-column --sort= --points-at
> - clone: --no-single-branch --shallow-submodules
> - commit: --patch --short --date --allow-empty
> - describe: --first-parent
> - fetch, pull: --unshallow --update-shallow
> - fsck: --name-objects
> - grep: --break --heading --show-function --function-context
> --untracked --no-index
> - mergetool: --prompt --no-prompt
> - reset: --keep
> - revert: --strategy= --strategy-option=
> - rm: --force
'--force' is a potentially destructive option, too.
> - shortlog: --email
> - tag: --merged --no-merged --create-reflog
>
> Signed-off-by: Cornelius Weig <cornelius.weig@xxxxxxxxxxx>
> Helped-by: Johannes Sixt <j6t@xxxxxxxx>
> ---
> contrib/completion/git-completion.bash | 31 +++++++++++++++++++++----------
> 1 file changed, 21 insertions(+), 10 deletions(-)
>
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index 0e09519..933bb6e 100644
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -936,6 +936,7 @@ _git_apply ()
> --apply --no-add --exclude=
> --ignore-whitespace --ignore-space-change
> --whitespace= --inaccurate-eof --verbose
> + --recount --directory=
> "
> return
> esac
> @@ -974,7 +975,7 @@ _git_archive ()
> --*)
> __gitcomp "
> --format= --list --verbose
> - --prefix= --remote= --exec=
> + --prefix= --remote= --exec= --output
> "
> return
> ;;
> @@ -1029,6 +1030,7 @@ _git_branch ()
> --track --no-track --contains --merged --no-merged
> --set-upstream-to= --edit-description --list
> --unset-upstream --delete --move --remotes
> + --column --no-column --sort= --points-at
> "
> ;;
> *)
> @@ -1142,6 +1144,8 @@ _git_clone ()
> --single-branch
> --branch
> --recurse-submodules
> + --no-single-branch
> + --shallow-submodules
> "
> return
> ;;
> @@ -1183,6 +1187,7 @@ _git_commit ()
> --reset-author --file= --message= --template=
> --cleanup= --untracked-files --untracked-files=
> --verbose --quiet --fixup= --squash=
> + --patch --short --date --allow-empty
> "
> return
> esac
> @@ -1201,7 +1206,7 @@ _git_describe ()
> --*)
> __gitcomp "
> --all --tags --contains --abbrev= --candidates=
> - --exact-match --debug --long --match --always
> + --exact-match --debug --long --match --always --first-parent
> "
> return
> esac
> @@ -1284,6 +1289,7 @@ __git_fetch_recurse_submodules="yes on-demand no"
> __git_fetch_options="
> --quiet --verbose --append --upload-pack --force --keep --depth=
> --tags --no-tags --all --prune --dry-run --recurse-submodules=
> + --unshallow --update-shallow
> "
>
> _git_fetch ()
> @@ -1333,7 +1339,7 @@ _git_fsck ()
> --*)
> __gitcomp "
> --tags --root --unreachable --cache --no-reflogs --full
> - --strict --verbose --lost-found
> + --strict --verbose --lost-found --name-objects
> "
> return
> ;;
> @@ -1377,6 +1383,8 @@ _git_grep ()
> --max-depth
> --count
> --and --or --not --all-match
> + --break --heading --show-function --function-context
> + --untracked --no-index
> "
> return
> ;;
> @@ -1576,7 +1584,7 @@ _git_mergetool ()
> return
> ;;
> --*)
> - __gitcomp "--tool="
> + __gitcomp "--tool= --prompt --no-prompt"
> return
> ;;
> esac
> @@ -2456,7 +2464,7 @@ _git_reset ()
>
> case "$cur" in
> --*)
> - __gitcomp "--merge --mixed --hard --soft --patch"
> + __gitcomp "--merge --mixed --hard --soft --patch --keep"
> return
> ;;
> esac
> @@ -2472,7 +2480,10 @@ _git_revert ()
> fi
> case "$cur" in
> --*)
> - __gitcomp "--edit --mainline --no-edit --no-commit --signoff"
> + __gitcomp "
> + --edit --mainline --no-edit --no-commit --signoff
> + --strategy= --strategy-option=
> + "
> return
> ;;
> esac
> @@ -2483,7 +2494,7 @@ _git_rm ()
> {
> case "$cur" in
> --*)
> - __gitcomp "--cached --dry-run --ignore-unmatch --quiet"
> + __gitcomp "--cached --dry-run --ignore-unmatch --quiet --force"
> return
> ;;
> esac
> @@ -2500,7 +2511,7 @@ _git_shortlog ()
> __gitcomp "
> $__git_log_common_options
> $__git_log_shortlog_options
> - --numbered --summary
> + --numbered --summary --email
> "
> return
> ;;
> @@ -2778,8 +2789,8 @@ _git_tag ()
> --*)
> __gitcomp "
> --list --delete --verify --annotate --message --file
> - --sign --cleanup --local-user --force --column --sort
> - --contains --points-at
> + --sign --cleanup --local-user --force --column --sort=
> + --contains --points-at --merged --no-merged --create-reflog
> "
> ;;
> esac
> --
> 2.10.2
>