From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Karsten Blees via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Karsten Blees <blees@dcon.de>
Subject: Re: [PATCH 1/1] gettext: always use UTF-8 on native Windows
Date: Wed, 3 Jul 2019 13:26:16 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1907031321270.44@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <ff37a2646a848e3eca8d02a001844986a3fa366b.1561625060.git.gitgitgadget@gmail.com>
Hi,
On Thu, 27 Jun 2019, Karsten Blees via GitGitGadget wrote:
> diff --git a/gettext.c b/gettext.c
> index d4021d690c..d8423e5c41 100644
> --- a/gettext.c
> +++ b/gettext.c
> @@ -12,7 +12,9 @@
> #ifndef NO_GETTEXT
> # include <locale.h>
> # include <libintl.h>
> -# ifdef HAVE_LIBCHARSET_H
> +# ifdef GIT_WINDOWS_NATIVE
> +# define locale_charset() "UTF-8"
> +# elif defined HAVE_LIBCHARSET_H
> # include <libcharset.h>
> # else
> # include <langinfo.h>
Sadly, this has a really unfortunate interaction with ab/no-kwset: the
latter patch series contains test cases that rely on being able to
use `LC_ALL=C` to prevent Git from assuming UTF-8 encoding.
I have this tentative patch queued up on Git for Windows' `shears/pu`
branch (i.e. the ever-green branch that continuously rebases all of Git
for Windows' patch thicket on top of `pu`):
https://github.com/git-for-windows/git/commit/e561446d
For you convenience:
-- snip --
diff --git a/gettext.c b/gettext.c
index 7da80db453c4..35d2c1218db2 100644
--- a/gettext.c
+++ b/gettext.c
@@ -13,7 +13,23 @@
# include <locale.h>
# include <libintl.h>
# ifdef GIT_WINDOWS_NATIVE
-# define locale_charset() "UTF-8"
+
+static const char *locale_charset(void)
+{
+ const char *env = getenv("LC_ALL"), *dot;
+
+ if (!env || !*env)
+ env = getenv("LC_CTYPE");
+ if (!env || !*env)
+ env = getenv("LANG");
+
+ if (!env)
+ return "UTF-8";
+
+ dot = strchr(env, '.');
+ return !dot ? env : dot + 1;
+}
+
# elif defined HAVE_LIBCHARSET_H
# include <libcharset.h>
# else
-- snap --
Junio, please hold off from advancing `kb/windows-force-utf8` until this
is resolved.
Also: does that diff look okay? Or would you rather want to avoid having
that function defined in that #if...#endif block?
Ciao,
Dscho
next prev parent reply other threads:[~2019-07-03 11:25 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-27 8:44 [PATCH 0/1] gettext(windows): always use UTF-8 Johannes Schindelin via GitGitGadget
2019-06-27 8:44 ` [PATCH 1/1] gettext: always use UTF-8 on native Windows Karsten Blees via GitGitGadget
2019-07-03 11:26 ` Johannes Schindelin [this message]
2019-07-03 18:31 ` Junio C Hamano
2019-07-03 20:46 ` [PATCH v2 0/1] gettext(windows): always use UTF-8 Johannes Schindelin via GitGitGadget
2019-07-03 20:46 ` [PATCH v2 1/1] gettext: always use UTF-8 on native Windows Karsten Blees via GitGitGadget
2019-07-04 22:53 ` Ævar Arnfjörð Bjarmason
2019-07-08 12:57 ` Johannes Schindelin
2019-07-08 18:30 ` 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=nycvar.QRO.7.76.6.1907031321270.44@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=blees@dcon.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
/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).