From: David Aguilar <davvid@gmail.com>
Date: Sat, 16 Feb 2013 05:47:43 +0000 (-0800)
Subject: difftool: silence uninitialized variable warning
X-Git-Tag: v1.8.3-rc0~202^2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/af14b5cf1bec831f90fb5d4136e0205de802b01b

difftool: silence uninitialized variable warning

Git::config() returns `undef` when given keys that do not exist.
Check that the $guitool value is defined to prevent a noisy
"Use of uninitialized variable $guitool in length" warning.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-difftool.perl b/git-difftool.perl
index 0a90de4146..12231fbc67 100755
--- 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;
 		}
 	}