diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-12-05 12:58:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-05 12:58:21 -0800 |
| commit | 219ea0e79d1e5cdb5f1133aff70fe4e5737dd59d (patch) | |
| tree | 0fb28a4a761e807bf7864e67bddd9236d4e4d866 /git-am.sh | |
| parent | 86cd8dc8e7b04e143bff4e61a7a036a989775507 (diff) | |
| parent | fcb06a8d54e29d12bb8160b978ce78331c95a1bf (diff) | |
| download | git-219ea0e79d1e5cdb5f1133aff70fe4e5737dd59d.tar.gz | |
Merge branch 'jk/replace-perl-in-built-scripts'
* jk/replace-perl-in-built-scripts:
use @@PERL@@ in built scripts
Diffstat (limited to 'git-am.sh')
| -rwxr-xr-x | git-am.sh | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 /) { |