Re: [PATCH] completion: use __gitcomp_builtin for format-patch

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Oct 22, 2018, 12:12 UTC
Message-ID: <nycvar.QRO.7.76.6.1810221411220.4546@tvgsbejvaqbjf.bet>
In-Reply-To: <20181021084102.8318-1-pclouds@gmail.com>

Hi Duy,

On Sun, 21 Oct 2018, Nguyễn Thái Ngọc Duy wrote:

Show 36 quoted lines

> This helps format-patch gain completion for a couple new options,
> notably --range-diff.
> 
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---
>  Of course it will be even better if I could complete the ref for
>  --range-diff=, but maybe another day.
> 
>  contrib/completion/git-completion.bash | 10 +++-------
>  1 file changed, 3 insertions(+), 7 deletions(-)
> 
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index c8fdcf8644..065b922777 100644
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -1533,12 +1533,8 @@ _git_fetch ()
>  }
>  
>  __git_format_patch_options="
> -	--stdout --attach --no-attach --thread --thread= --no-thread
> -	--numbered --start-number --numbered-files --keep-subject --signoff
> -	--signature --no-signature --in-reply-to= --cc= --full-index --binary
> -	--not --all --cover-letter --no-prefix --src-prefix= --dst-prefix=
> -	--inline --suffix= --ignore-if-in-upstream --subject-prefix=
> -	--output-directory --reroll-count --to= --quiet --notes
> +	--full-index --not --all --no-prefix --src-prefix=
> +	--dst-prefix= --notes
>  "
>  
>  _git_format_patch ()
> @@ -1551,7 +1547,7 @@ _git_format_patch ()
>  		return
>  		;;
>  	--*)
> -		__gitcomp "$__git_format_patch_options"
> +		__gitcomp_builtin format-patch "$__git_format_patch_options"

Is it just me, or does this fail t9902 for you, too, where it wants to complete the --cover-letter option for *send-email* (not for *format-patch*)?

See e.g. https://git-for-windows.visualstudio.com/git/_build/results?buildId=22023&view=logs

Ciao, Dscho

Show 8 quoted lines

>  		return
>  		;;
>  	esac
> -- 
> 2.19.1.647.g708186aaf9
> 
> 
>