[PATCH 2/2] difftool: handle uninitialized variable on empty diff
- From
Tim Henigan <tim.henigan@gmail.com>
- Date
- Jun 28, 2012, 19:39 UTC
- Message-ID
- <1340912395-16990-2-git-send-email-tim.henigan@gmail.com>
- In-Reply-To
- <1340912395-16990-1-git-send-email-tim.henigan@gmail.com>
When 'difftool --dir-diff' finds no changes, it results in an uninitialized variable warning.
Signed-off-by: Tim Henigan <tim.henigan@gmail.com> --- git-difftool.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-difftool.perl b/git-difftool.perl index 679a56d..c94557d 100755 --- a/git-difftool.perl +++ b/git-difftool.perl @@ -117,7 +117,7 @@ sub setup_dir_diff # by Git->repository->command*. my $diffrepo = Git->repository(Repository => $repo_path, WorkingCopy => $workdir); my $diffrtn = $diffrepo->command_oneline('diff', '--raw', '--no-abbrev', '-z', @ARGV); - exit(0) if (length($diffrtn) == 0); + exit(0) if ((not defined($diffrtn)) or (length($diffrtn) == 0)); # Setup temp directories my $tmpdir = tempdir('git-diffall.XXXXX', CLEANUP => 1, TMPDIR => 1);
-- 1.7.11.1.134.gda62046