Re: [PATCH 5/6] completion: clarify difftool completion

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 3, 2013, 17:29 UTC
Message-ID: <7vip1vgl17.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1370181822-23450-6-git-send-email-artagnon@gmail.com>

Ramkumar Ramachandra <artagnon@gmail.com> writes:

Show 5 quoted lines

> 'git difftool' is clearly a frontend to 'git diff' and is used in
> exactly the same way, but it uses a misleading completion function name
> __git_complete_file (aliased to to __git_complete_revlist_file).  Change
> it to use __git_complete_revlist_file, just like 'git diff'.  No
> functional changes.

Makes sense. The completion helper for both revname and pathname should not be called __git_complete_file, and this is a step in the right direction.

If we have a situation where we _know_ we only want to complete pathname and never revname, we may want to keep __git_complete_file function. For example, after seeing "--" on the command line, we may want to use __git_complete_file (that does not look at revs, instead of __git_complete_revlist_file function.

Will apply.

Thanks.

Show 19 quoted lines

>
> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
> ---
>  contrib/completion/git-completion.bash | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index f46964d..8d70c30 100644
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -1305,7 +1305,7 @@ _git_difftool ()
>  		return
>  		;;
>  	esac
> -	__git_complete_file
> +	__git_complete_revlist_file
>  }
>  
>  __git_fetch_options="