mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/replace-perl-in-built-scripts'

Browse Source 
* jk/replace-perl-in-built-scripts:
  use @@PERL@@ in built scripts
This commit is contained in:
Junio C Hamano
2013-12-05 12:58:21 -08:00
parent 86cd8dc8e7 fcb06a8d54
commit 219ea0e79d
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
git-am.sh
View File

@ -302,7 +302,7 @@ split_patches () {
# not starting with Author, From or Date is the # not starting with Author, From or Date is the
# subject, and the body starts with the next nonempty # subject, and the body starts with the next nonempty
# line not starting with Author, From or Date # line not starting with Author, From or Date
perl -ne 'BEGIN { $subject = 0 } @@PERL@@ -ne 'BEGIN { $subject = 0 }
if ($subject > 1) { print ; } if ($subject > 1) { print ; }
elsif (/^\s+$/) { next ; } elsif (/^\s+$/) { next ; }
elsif (/^Author:/) { s/Author/From/ ; print ;} elsif (/^Author:/) { s/Author/From/ ; print ;}
@ -334,7 +334,7 @@ split_patches () {
# Since we cannot guarantee that the commit message is in # Since we cannot guarantee that the commit message is in
# git-friendly format, we put no Subject: line and just consume # git-friendly format, we put no Subject: line and just consume
# all of the message as the body # 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 ; } if ($subject) { print ; }
elsif (/^\# User /) { s/\# User/From:/ ; print ; } elsif (/^\# User /) { s/\# User/From:/ ; print ; }
elsif (/^\# Date /) { elsif (/^\# Date /) {

2
git-instaweb.sh
View File

@ -581,7 +581,7 @@ EOF
gitweb_conf() { gitweb_conf() {
cat > "$fqgitdir/gitweb/gitweb_config.perl" <<EOF cat > "$fqgitdir/gitweb/gitweb_config.perl" <<EOF
#!/usr/bin/perl #!@@PERL@@
our \$projectroot = "$(dirname "$fqgitdir")"; our \$projectroot = "$(dirname "$fqgitdir")";
our \$git_temp = "$fqgitdir/gitweb/tmp"; our \$git_temp = "$fqgitdir/gitweb/tmp";
our \$projects_list = \$projectroot; our \$projects_list = \$projectroot;

2
git-request-pull.sh
View File

@ -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") url=$(git ls-remote --get-url "$url")

2
git-submodule.sh
View File

@ -156,7 +156,7 @@ module_list()
git ls-files -z --error-unmatch --stage -- "$@" || git ls-files -z --error-unmatch --stage -- "$@" ||
echo "unmatched pathspec exists" echo "unmatched pathspec exists"
) | ) |
perl -e ' @@PERL@@ -e '
my %unmerged = (); my %unmerged = ();
my ($null_sha1) = ("0" x 40); my ($null_sha1) = ("0" x 40);
my @out = (); my @out = ();