From: Steffen Prohaska Date: Thu, 18 Oct 2007 10:25:34 +0000 (+0200) Subject: mergetool: avoid misleading message "Resetting to default..." X-Git-Tag: v1.5.4-rc0~293^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d279fc1a76bf9bfeedded1a1c8ebcfc8779f5b10;p=git.git mergetool: avoid misleading message "Resetting to default..." 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 Signed-off-by: Shawn O. Pearce --- diff --git a/git-mergetool.sh b/git-mergetool.sh index 94511f9d1..a68b40386 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