diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-03-16 01:00:46 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-03-16 01:00:46 +0300 |
commit | ae1644b08e85fb64367b273337d8ebcbdabe0685 (patch) | |
tree | a4abf768e05299a5152bcbb93b298462b44ad2e7 /contrib | |
parent | e74737b6a1d403bd0ad856bd23143ba0bd5dfabb (diff) | |
parent | 1aca69c0195bd4ac671e7a36cf9b967d2bcbe200 (diff) |
Merge branch 'ab/perl-fixes'
Clean-up to various pieces of Perl code we have.
* ab/perl-fixes:
perl Git::LoadCPAN: emit better errors under NO_PERL_CPAN_FALLBACKS
Makefile: add NO_PERL_CPAN_FALLBACKS knob
perl: move the perl/Git/FromCPAN tree to perl/FromCPAN
perl: generalize the Git::LoadCPAN facility
perl: move CPAN loader wrappers to another namespace
perl: update our copy of Mail::Address
perl: update our ancient copy of Error.pm
git-send-email: unconditionally use Net::{SMTP,Domain}
Git.pm: hard-depend on the File::{Temp,Spec} modules
gitweb: hard-depend on the Digest::MD5 5.8 module
Git.pm: add the "use warnings" pragma
Git.pm: remove redundant "use strict" from sub-package
perl: *.pm files should not have the executable bit
Diffstat (limited to 'contrib')
-rwxr-xr-x | contrib/examples/git-difftool.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/examples/git-difftool.perl b/contrib/examples/git-difftool.perl index fb0fd0b84b..b2ea80f9ed 100755 --- a/contrib/examples/git-difftool.perl +++ b/contrib/examples/git-difftool.perl @@ -13,7 +13,7 @@ use 5.008; use strict; use warnings; -use Git::Error qw(:try); +use Git::LoadCPAN::Error qw(:try); use File::Basename qw(dirname); use File::Copy; use File::Find; |