From: Shawn O. Pearce <spearce@spearce.org>
Date: Wed, 18 Feb 2009 17:05:18 GMT
Subject: Re: [PATCH v2 2/2] bash completion: only show 'log --merge' if merging
Message-ID: <20090218170518.GD22848@spearce.org>
In-Reply-To: <bc66ec312ad33c4a7c9580ba4ade75c5998443d7.1234801852.git.trast@student.ethz.ch>

Thomas Rast <trast@student.ethz.ch> wrote:
> The gitk completion only shows --merge if MERGE_HEAD is present.
> Do it the same way for git-log completion.
> 
> Signed-off-by: Thomas Rast <trast@student.ethz.ch>
> ---
>  contrib/completion/git-completion.bash |    7 ++++++-
>  1 files changed, 6 insertions(+), 1 deletions(-)

Both patches,

Acked-by: Shawn O. Pearce <spearce@spearce.org>
 
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index a5b3bf3..489951b 100755
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -1003,6 +1003,11 @@ _git_log ()
>  	__git_has_doubledash && return
>  
>  	local cur="${COMP_WORDS[COMP_CWORD]}"
> +	local g="$(git rev-parse --git-dir 2>/dev/null)"
> +	local merge=""
> +	if [ -f $g/MERGE_HEAD ]; then
> +		merge="--merge"
> +	fi
>  	case "$cur" in
>  	--pretty=*)
>  		__gitcomp "$__git_log_pretty_formats
> @@ -1030,7 +1035,7 @@ _git_log ()
>  			--decorate
>  			--walk-reflogs
>  			--parents --children
> -			--merge
> +			$merge
>  			$__git_diff_common_options
>  			--pickaxe-all --pickaxe-regex
>  			"
> -- 
> 1.6.2.rc0.328.g2c702
> 

-- 
Shawn.