From: "Dmitry V. Levin" <ldv@altlinux.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, Antoine Pelisse <apelisse@gmail.com>,
git@vger.kernel.org
Subject: [PATCH v3] am: invoke perl's strftime in C locale
Date: Tue, 15 Jan 2013 23:05:17 +0400 [thread overview]
Message-ID: <20130115190517.GB7963@altlinux.org> (raw)
In-Reply-To: <20130115174015.GA7471@altlinux.org>
This fixes "hg" patch format support for locales other than C and en_*.
Before the change, git-am was making "Date:" line from hg changeset
metadata according to the current locale, and this line was rejected
later with "invalid date format" diagnostics because localized date
strings are not supported.
Reported-by: Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org>
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
---
v3: alternative implementation using setlocale(LC_TIME, "C")
git-am.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/git-am.sh b/git-am.sh
index c682d34..8677d8c 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -334,7 +334,8 @@ 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 }
+ perl -M'POSIX qw(strftime :locale_h)' -ne '
+ BEGIN { setlocale(LC_TIME, "C"); $subject = 0 }
if ($subject) { print ; }
elsif (/^\# User /) { s/\# User/From:/ ; print ; }
elsif (/^\# Date /) {
--
ldv
next prev parent reply other threads:[~2013-01-15 19:05 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-14 20:59 [PATCH] am: invoke perl's strftime in C locale Dmitry V. Levin
2013-01-14 21:49 ` Junio C Hamano
2013-01-14 22:36 ` [PATCH v2] " Dmitry V. Levin
2013-01-15 15:59 ` [PATCH] " Jeff King
2013-01-15 16:42 ` Antoine Pelisse
2013-01-15 16:50 ` Jeff King
2013-01-15 17:40 ` Dmitry V. Levin
2013-01-15 19:05 ` Dmitry V. Levin [this message]
2013-01-18 20:36 ` [PATCH v3] " Junio C Hamano
2013-01-19 16:39 ` Jeff King
2013-01-19 20:28 ` Dmitry V. Levin
2013-01-20 17:47 ` Junio C Hamano
2013-01-15 19:14 ` [PATCH] " Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130115190517.GB7963@altlinux.org \
--to=ldv@altlinux.org \
--cc=apelisse@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).