Perly Git: arrange include path settings properly.

Before "use Git" takes effect, we would need to set up the Perl
library path to point at the local installation location.  So
that instruction needs to be in BEGIN{} block.

Pointed out and fixed by Pavel Roskin.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-fmt-merge-msg.perl b/git-fmt-merge-msg.perl
index e8fad02e757506e423b05b4a37fe3df8dba87ab2..1b23fa150b7dd8af9850af71382e78c1a21c7321 100755 (executable)
--- a/git-fmt-merge-msg.perl
+++ b/git-fmt-merge-msg.perl
@@ -5,7 +5,7 @@
 # Read .git/FETCH_HEAD and make a human readable merge message
 # by grouping branches and tags together to form a single line.
 
 # Read .git/FETCH_HEAD and make a human readable merge message
 # by grouping branches and tags together to form a single line.
 

-unshift @INC, '@@INSTLIBDIR@@';
+BEGIN { unshift @INC, '@@INSTLIBDIR@@'; }

 use strict;
 use Git;
 use Error qw(:try);
 use strict;
 use Git;
 use Error qw(:try);

diff --git a/git-mv.perl b/git-mv.perl
index f1bde4307ba719ce0e78ad360aa2ce1f4b7c6958..a60489617e517d02b824f14815c2be61209df6b6 100755 (executable)
--- a/git-mv.perl
+++ b/git-mv.perl
@@ -6,7 +6,7 @@
 # This file is licensed under the GPL v2, or a later version
 # at the discretion of Linus Torvalds.
 
 # This file is licensed under the GPL v2, or a later version
 # at the discretion of Linus Torvalds.
 

-
+BEGIN { unshift @INC, '@@INSTLIBDIR@@'; }

 use warnings;
 use strict;
 use Getopt::Std;
 use warnings;
 use strict;
 use Getopt::Std;