From: Steffen Prohaska Date: Thu, 18 Oct 2007 10:25:34 GMT Subject: [PATCH] mergetool: avoid misleading message "Resetting to default..." Message-ID: <11927031342272-git-send-email-prohaska@zib.de> In-Reply-To: <4591BA15-EB6B-4058-A2D0-879556481E59@zib.de> If no mergetool is configured in the configuration variable merge.tool the resetting message should not be printed. This is fixed. The message is only printed if a tool is configured but the entry in merge.tool is invalid. Signed-off-by: Steffen Prohaska --- git-mergetool.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/git-mergetool.sh b/git-mergetool.sh index 94511f9..a68b403 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -334,7 +334,7 @@ init_merge_tool_path() { if test -z "$merge_tool"; then merge_tool=`git config merge.tool` - if ! valid_tool "$merge_tool"; then + if test -n "$merge_tool" && ! valid_tool "$merge_tool"; then echo >&2 "git config option merge.tool set to unknown tool: $merge_tool" echo >&2 "Resetting to default..." unset merge_tool -- 1.5.3.4.222.g2830