difftool: silence uninitialized variable warning
authorDavid Aguilar <davvid@gmail.com>
Sat, 16 Feb 2013 05:47:43 +0000 (21:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 Feb 2013 22:34:38 +0000 (14:34 -0800)
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>
git-difftool.perl
index 0a90de414646b901e13abbf89aa78ae71e8b12f0..12231fbc6708971f6350006c710124bd369de7ab 100755 (executable)
@@ -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;
                }
        }