Merge branch 'dl/am-hg-locale' into maint
"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:
commit
61947de909
@ -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
|
||||
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 /) {
|
||||
|
Loading…
Reference in New Issue
Block a user