threads / patch / 20480

patch, 9 partsupdate 'git apply' bash-completion according to its man page

Subject: [PATCH 9/9] update 'git apply' bash-completion according to its man page

## tl;dr

2 messages between Aug 8, 2009 and Aug 8, 2009. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Emmanuel Trillaud· Aug 8, 2009, 08:57 UTC · lore

---
 contrib/completion/git-completion.bash |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

Show changes to contrib/completion/git-completion.bash +8 −2

diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 8ba1249..c08422c 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -694,9 +694,15 @@ _git_apply ()
 	--*)
 		__gitcomp "
 			--stat --numstat --summary --check --index
-			--cached --index-info --reverse --reject --unidiff-zero
-			--apply --no-add --exclude=
+			--cached
+			--build-fake-ancestor=
+			--index-info --reverse --reject --unidiff-zero
+			--apply --no-add
+			--exclude=
+			--include=
 			--whitespace= --inaccurate-eof --verbose
+			--recount
+			--directory=
 			"
 		return
 	esac

-- 
1.6.4

Junio C Hamano· Aug 8, 2009, 19:50 UTC · re: Emmanuel Trillaud · lore

Re: [PATCH 9/9] update 'git apply' bash-completion according to its man page

Emmanuel Trillaud <etrillaud@gmail.com> writes:

Show 24 quoted lines

> ---
>  contrib/completion/git-completion.bash |   10 ++++++++--
>  1 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/contrib/completion/git-completion.bash
> b/contrib/completion/git-completion.bash
> index 8ba1249..c08422c 100755
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -694,9 +694,15 @@ _git_apply ()
>  	--*)
>  		__gitcomp "
>  			--stat --numstat --summary --check --index
> -			--cached --index-info --reverse --reject --unidiff-zero
> -			--apply --no-add --exclude=
> +			--cached
> +			--build-fake-ancestor=
> +			--index-info --reverse --reject --unidiff-zero
> +			--apply --no-add
> +			--exclude=
> +			--include=
>  			--whitespace= --inaccurate-eof --verbose
> +			--recount
> +			--directory=

I'd rather suggest dropping --no-add that is script-only and not useful in interactive use. I also won't add --build-fake-ancestor for the same reason.