Merge branch 'da/difftool-fixes'

Minor maintenance updates to difftool, and updates to its tests. * da/difftool-fixes: t7800: "defaults" is no longer a builtin tool name t7800: modernize tests t7800: update copyright notice difftool: silence uninitialized variable warning
git-mirror · Mar 21, 2013 · 98ed062 · 98ed062
2 parents e3b3b73 + f469e84
commit 98ed062
Show file tree

Hide file tree

Showing 2 changed files with 170 additions and 200 deletions.
diff --git a/git-difftool.perl b/git-difftool.perl
@@ -336,7 +336,7 @@ sub main
 	}
 	if ($opts{gui}) {
 		my $guitool = Git::config('diff.guitool');
-		if (length($guitool) > 0) {
+		if (defined($guitool) && length($guitool) > 0) {
 			$ENV{GIT_DIFF_TOOL} = $guitool;
 		}
 	}