summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-12-05 20:58:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-12-05 20:58:21 (GMT)
commit219ea0e79d1e5cdb5f1133aff70fe4e5737dd59d (patch)
tree0fb28a4a761e807bf7864e67bddd9236d4e4d866
parent86cd8dc8e7b04e143bff4e61a7a036a989775507 (diff)
parentfcb06a8d54e29d12bb8160b978ce78331c95a1bf (diff)
downloadgit-219ea0e79d1e5cdb5f1133aff70fe4e5737dd59d.zip
git-219ea0e79d1e5cdb5f1133aff70fe4e5737dd59d.tar.gz
git-219ea0e79d1e5cdb5f1133aff70fe4e5737dd59d.tar.bz2
Merge branch 'jk/replace-perl-in-built-scripts'
* jk/replace-perl-in-built-scripts: use @@PERL@@ in built scripts
-rwxr-xr-xgit-am.sh4
-rwxr-xr-xgit-instaweb.sh2
-rwxr-xr-xgit-request-pull.sh2
-rwxr-xr-xgit-submodule.sh2
4 files changed, 5 insertions, 5 deletions
diff --git a/git-am.sh b/git-am.sh
index 7ea40fe..bbea430 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -302,7 +302,7 @@ split_patches () {
# not starting with Author, From or Date is the
# subject, and the body starts with the next nonempty
# line not starting with Author, From or Date
- perl -ne 'BEGIN { $subject = 0 }
+ @@PERL@@ -ne 'BEGIN { $subject = 0 }
if ($subject > 1) { print ; }
elsif (/^\s+$/) { next ; }
elsif (/^Author:/) { s/Author/From/ ; print ;}
@@ -334,7 +334,7 @@ split_patches () {
# Since we cannot guarantee that the commit message is in
# git-friendly format, we put no Subject: line and just consume
# all of the message as the body
- LANG=C LC_ALL=C perl -M'POSIX qw(strftime)' -ne 'BEGIN { $subject = 0 }
+ LANG=C LC_ALL=C @@PERL@@ -M'POSIX qw(strftime)' -ne 'BEGIN { $subject = 0 }
if ($subject) { print ; }
elsif (/^\# User /) { s/\# User/From:/ ; print ; }
elsif (/^\# Date /) {
diff --git a/git-instaweb.sh b/git-instaweb.sh
index 01a1b05..e93a238 100755
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -581,7 +581,7 @@ EOF
gitweb_conf() {
cat > "$fqgitdir/gitweb/gitweb_config.perl" <<EOF
-#!/usr/bin/perl
+#!@@PERL@@
our \$projectroot = "$(dirname "$fqgitdir")";
our \$git_temp = "$fqgitdir/gitweb/tmp";
our \$projects_list = \$projectroot;
diff --git a/git-request-pull.sh b/git-request-pull.sh
index ebf1269..fe21d5d 100755
--- a/git-request-pull.sh
+++ b/git-request-pull.sh
@@ -106,7 +106,7 @@ find_matching_ref='
}
'
-ref=$(git ls-remote "$url" | perl -e "$find_matching_ref" "$head" "$headrev" "$tag_name")
+ref=$(git ls-remote "$url" | @@PERL@@ -e "$find_matching_ref" "$head" "$headrev" "$tag_name")
url=$(git ls-remote --get-url "$url")
diff --git a/git-submodule.sh b/git-submodule.sh
index c878d95..ed02f03 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -156,7 +156,7 @@ module_list()
git ls-files -z --error-unmatch --stage -- "$@" ||
echo "unmatched pathspec exists"
) |
- perl -e '
+ @@PERL@@ -e '
my %unmerged = ();
my ($null_sha1) = ("0" x 40);
my @out = ();