undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mergetool: avoid misleading message "Resetting to default..."

Browse Source 
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 <prohaska@zib.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Steffen Prohaska 2007-10-18 12:25:34 +02:00 committed by Shawn O. Pearce
parent ca8e6b7a55
commit d279fc1a76
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-mergetool.sh
View File

@ -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