Re: [PATCH 1/2 v3] mergetool: use path to mergetool in config var mergetool.<tool>.path

From: Shawn O. Pearce <spearce@spearce.org>
Date: Oct 18, 2007, 05:27 UTC
Message-ID: <20071018052724.GA27813@spearce.org>
In-Reply-To: <11926413723666-git-send-email-prohaska@zib.de>

Steffen Prohaska <prohaska@zib.de> wrote:

> This commit adds a mechanism to provide absolute paths to the
> external programs called by 'git mergetool'.  ...

...

Show 13 quoted lines

> @@ -297,17 +297,38 @@ do
>      shift
>  done
>  
> +valid_tool() {
> +	case "$1" in
> +		kdiff3 | tkdiff | xxdiff | meld | opendiff | emerge | vimdiff | gvimdiff)
> +			;; # happy
> +		*)
> +			return 1
> +			;;
> +	esac
> +}

...

> +    test -n "$merge_tool" || valid_tool "$merge_tool" || {

Wouldn't an empty $merge_tool string be caught above in the valid_tool function where it falls through and returns 1? So isn't test -n here redundant?

-- 
Shawn.