diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-28 18:59:24 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-28 18:59:24 (GMT) |
| commit | 738b314a3e3a9baa45b269ffa35732e54331f7b7 (patch) | |
| tree | c5b2239e881765ac6cc79349438e771150d79305 | |
| parent | d959a78d98283a1166504184a497a798b7d81f3f (diff) | |
| parent | 5185b9707a768a0ad17de4765c7893f86f4c4a0e (diff) | |
| download | git-738b314a3e3a9baa45b269ffa35732e54331f7b7.zip git-738b314a3e3a9baa45b269ffa35732e54331f7b7.tar.gz git-738b314a3e3a9baa45b269ffa35732e54331f7b7.tar.bz2 | |
Merge branch 'dl/am-hg-locale'
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
| -rwxr-xr-x | git-am.sh | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 /) { |