diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-04 10:04:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-04 10:04:10 -0800 |
| commit | 61947de909ae1fa6112a58a812c6202cd02d3549 (patch) | |
| tree | b0b566adb98e6f8a5786755200c62aef96c2a24b /git-am.sh | |
| parent | ba8748e6d62c8020700a1437d74b80cfbd499379 (diff) | |
| parent | 5185b9707a768a0ad17de4765c7893f86f4c4a0e (diff) | |
| download | git-61947de909ae1fa6112a58a812c6202cd02d3549.tar.gz git-61947de909ae1fa6112a58a812c6202cd02d3549.tar.xz | |
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
Diffstat (limited to 'git-am.sh')
| -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 /) { |