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

Merge branch 'dl/am-hg-locale' into maint

Browse Source 
"git am" did not parse datestamp correctly from Hg generated patch,
when it is run in a locale outside C (or en)

* dl/am-hg-locale:
  am: invoke perl's strftime in C locale
This commit is contained in:
Junio C Hamano
2013-02-04 10:04:10 -08:00
parent ba8748e6d6 5185b9707a
commit 61947de909
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git-am.sh
View File

@ -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
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 /) {