From: Erik Faye-Lund Date: Thu, 25 Nov 2010 14:54:19 GMT Subject: Re: What's cooking in git.git (Nov 2010, #03; Wed, 24) Message-ID: In-Reply-To: On Thu, Nov 25, 2010 at 1:34 PM, Erik Faye-Lund wrote: > On Thu, Nov 25, 2010 at 1:00 PM, Ævar Arnfjörð Bjarmason > wrote: >> On Thu, Nov 25, 2010 at 11:35, Erik Faye-Lund wrote: >>> On Thu, Nov 25, 2010 at 10:45 AM, Ævar Arnfjörð Bjarmason >>> wrote: >> >>>> Is there anything else than that (the builtin.h includes) that you >>>> think needs work? >>> >>> There was an issue where setting NO_GETTEXT wasn't enough to disable >>> internationalization. Has this been fixed? >> >> Do you mean the issue with eval_gettext in git-sh-i18n.sh? I fixed >> that issue, but even under NO_GETTEXT=YesPlease we'll still pass >> things through git-sh-i18n--envsubst. Since I can't just #define >> things out under NO_GETTEXT=Yes like I can in the C code. >> >> Maybe you mean something different that I'm forgetting. But IIRC that >> was the only issue. >> > > I'm talking about this: > > $ git diff > diff --git a/Makefile b/Makefile > index 8357106..0a49c2c 100644 > --- a/Makefile > +++ b/Makefile > @@ -1124,6 +1124,7 @@ ifeq ($(uname_S),Windows) >        NO_STRTOK_R = YesPlease >        NO_FNMATCH = YesPlease >        NO_MEMMEM = YesPlease > +       NO_GETTEXT = YesPlease >        # NEEDS_LIBICONV = YesPlease >        NO_ICONV = YesPlease >        NO_C99_FORMAT = YesPlease > Uhm, my bad. This was in the MINGW-section. Seems this issue has been fixed now, thanks.