summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-06-28 03:17:07 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-07-02 17:14:43 -0700
commitf1b8fd4abae7910d9227ae019220944e8fac6884 (patch)
tree6a225aed57a923093a2bc97901f0f1a17d1023cf
parentAdd possibility to pass CFLAGS and LDFLAGS specific to the perl subdir (diff)
downloadtgif-f1b8fd4abae7910d9227ae019220944e8fac6884.tar.xz
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>
-rwxr-xr-xgit-fmt-merge-msg.perl2
-rwxr-xr-xgit-mv.perl2
2 files changed, 2 insertions, 2 deletions
diff --git a/git-fmt-merge-msg.perl b/git-fmt-merge-msg.perl
index e8fad02e75..1b23fa150b 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 f1bde4307b..a60489617e 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;