From: Junio C Hamano <junkio@cox.net>
Date: Wed, 28 Jun 2006 10:17:07 +0000 (-0700)
Subject: Perly Git: arrange include path settings properly.
X-Git-Tag: v1.4.3-rc1~2^2~30
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f1b8fd4abae7910d9227ae019220944e8fac6884;p=git.git

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 e8fad02e7..1b23fa150 100755
--- 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.
 
-unshift @INC, '@@INSTLIBDIR@@';
+BEGIN { unshift @INC, '@@INSTLIBDIR@@'; }
 use strict;
 use Git;
 use Error qw(:try);
diff --git a/git-mv.perl b/git-mv.perl
index f1bde4307..a60489617 100755
--- 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.
 
-
+BEGIN { unshift @INC, '@@INSTLIBDIR@@'; }
 use warnings;
 use strict;
 use Getopt::Std;