Eliminate a global variable and File::Find usage by building upon
basename() and glob() instead.
Signed-off-by: David Aguilar <dav...@gmail.com>
---
Same as before, resending because gmail ate patch 4/5
git-difftool.perl | 25 +++++--------------------
1 file changed, 5 insertions(+), 20 deletions(-)
diff --git a/git-difftool.perl b/git-difftool.perl
index c079854..ac0ed63 100755
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -13,17 +13,15 @@
use 5.008;
use strict;
use warnings;
-use File::Basename qw(dirname);
+use File::Basename qw(basename dirname);
use File::Copy;
use File::Compare;
-use File::Find;
use File::stat;
use File::Path qw(mkpath);
use File::Temp qw(tempdir);
use Getopt::Long qw(:config pass_through);
use Git;
-my @tools;
my @working_tree;
my $rc;
my $repo = Git->repository();
@@ -65,26 +63,13 @@ sub find_worktree
my $workdir = find_worktree();
-sub filter_tool_scripts
-{
- if (-d $_) {
- if ($_ ne ".") {
- # Ignore files in subdirectories
- $File::Find::prune = 1;
- }
- } else {
- if ((-f $_) && ($_ ne "defaults")) {
- push(@tools, $_);
- }
- }
-}
-
sub print_tool_help
{
my ($cmd, @found, @notfound);
my $gitpath = Git::exec_path();
- find(\&filter_tool_scripts, "$gitpath/mergetools");
+ my @files = map { basename($_) } glob("$gitpath/mergetools/*");
+ my @tools = sort(grep { !m{^defaults$} } @files);
foreach my $tool (@tools) {
$cmd = "TOOL_MODE=diff";
@@ -99,10 +84,10 @@ sub print_tool_help
}
print "'git difftool --tool=<tool>' may be set to one of the
following:\n";
- print "\t$_\n" for (sort(@found));
+ print "\t$_\n" for (@found);
print "\nThe following tools are valid, but not currently available:\n";
- print "\t$_\n" for (sort(@notfound));
+ print "\t$_\n" for (@notfound);
print "\nNOTE: Some of the tools listed above only work in a
windowed\n";
print "environment. If run in a terminal-only session, they will
fail.\n";
--
1.7.11.2.255.g5f133da
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
