[PATCH] difftool: silence warning
From: Ross Lagerwall <hidden>
Date: 2016-06-15 22:54:32
Subsystem:
the rest · Maintainer:
Linus Torvalds
Silence a warning given when running git difftool --dir-diff and there are no changes. This is because command_oneline returns undef when the command has no output, not ''. Signed-off-by: Ross Lagerwall <redacted> --- git-difftool.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-difftool.perl b/git-difftool.perl
index ae1e052..1cfcbb3 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) unless defined($diffrtn); # Setup temp directories my $tmpdir = tempdir('git-diffall.XXXXX', CLEANUP => 1, TMPDIR => 1);
--
1.7.11.4