Skip to content

Commit 61947de

Browse files
committed
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
2 parents ba8748e + 5185b97 commit 61947de

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

git-am.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ split_patches () {
334334
# Since we cannot guarantee that the commit message is in
335335
# git-friendly format, we put no Subject: line and just consume
336336
# all of the message as the body
337-
perl -M'POSIX qw(strftime)' -ne 'BEGIN { $subject = 0 }
337+
LANG=C LC_ALL=C perl -M'POSIX qw(strftime)' -ne 'BEGIN { $subject = 0 }
338338
if ($subject) { print ; }
339339
elsif (/^\# User /) { s/\# User/From:/ ; print ; }
340340
elsif (/^\# Date /) {

0 commit comments

Comments
 (0)