From: David Aguilar <davvid@gmail.com>
Date: Mon, 16 May 2016 18:05:36 +0000 (-0700)
Subject: difftool: initialize variables for readability
X-Git-Tag: v2.8.4~2^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/951b551d0f349f145f8606b946d64fc452ad6a51?ds=sidebyside;hp=-c

difftool: initialize variables for readability

The code always goes into one of the two conditional blocks but make it
clear that not doing so is an error condition by setting $ok to 0.

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

951b551d0f349f145f8606b946d64fc452ad6a51
diff --git a/git-difftool.perl b/git-difftool.perl
index 488d14b153..8cf0040590 100755
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -273,7 +273,7 @@ sub setup_dir_diff
 	# temporary file to both the left and right directories to show the
 	# change in the recorded SHA1 for the submodule.
 	for my $path (keys %submodule) {
-		my $ok;
+		my $ok = 0;
 		if (defined($submodule{$path}{left})) {
 			$ok = write_to_file("$ldir/$path",
 				"Subproject commit $submodule{$path}{left}");
@@ -289,7 +289,7 @@ sub setup_dir_diff
 	# shows only the link itself, not the contents of the link target.
 	# This loop replicates that behavior.
 	for my $path (keys %symlink) {
-		my $ok;
+		my $ok = 0;
 		if (defined($symlink{$path}{left})) {
 			$ok = write_to_file("$ldir/$path",
 					$symlink{$path}{left});