Merge branch 'dl/am-hg-locale'
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Jan 2013 18:59:24 +0000 (10:59 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Jan 2013 18:59:24 +0000 (10:59 -0800)
Datestamp recorded in "Hg" format patch was reformatted incorrectly
to an e-mail looking date using locale dependant strftime, causing
patch application to fail.

* dl/am-hg-locale:
am: invoke perl's strftime in C locale

git-am.sh
index c682d34094d618734ac52d6d7e15a6c10ccfdeb6..b4d95f58c6f77e2b80a85be9b147351747926235 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -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 /) {