From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 25 Jul 2017 08:35:57 +0000 (+0200)
Subject: git-gui (MinGW): make use of MSys2's msgfmt
X-Git-Tag: v2.14.2~62^2^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/492595cfc70f97cd99d4c460db1ba01b73dab932

git-gui (MinGW): make use of MSys2's msgfmt

When Git for Windows was still based on MSys1, we had no gettext, ergo
no msgfmt, either. Therefore, we introduced a small and simple Tcl
script to perform the same task.

However, with MSys2, we no longer need that because we have a proper
msgfmt executable. Plus, the po2msg.sh script somehow manages to hang
when run in parallel in Git for Windows' SDK (symptom: the Continuous
Testing tasks timing out).

Two reasons to use real msgfmt.exe instead.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Makefile b/Makefile
index fe30be38dc..918a8de369 100644
--- a/Makefile
+++ b/Makefile
@@ -161,7 +161,9 @@ ifeq ($(uname_S),Darwin)
 	endif
 endif
 ifneq (,$(findstring MINGW,$(uname_S)))
+ifeq ($(shell expr "$(uname_R)" : '1\.'),2)
 	NO_MSGFMT=1
+endif
 	GITGUI_WINDOWS_WRAPPER := YesPlease
 	GITGUI_RELATIVE := 1
 endif