diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-07-25 13:42:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-25 13:42:41 -0700 |
| commit | 90dbf226ba3fae0d932ae4e42d8d3122a47766bc (patch) | |
| tree | 142b78726092609973fe9b2d5055fe9aa85de3fc /git-gui/Makefile | |
| parent | 5800c63717ae35286a1441f14ffff753e01f7e2b (diff) | |
| parent | 492595cfc70f97cd99d4c460db1ba01b73dab932 (diff) | |
| download | git-90dbf226ba3fae0d932ae4e42d8d3122a47766bc.tar.gz | |
Merge branch 'js/msgfmt-on-windows' of ../git-gui into js/git-gui-msgfmt-on-windowsjs/git-gui-msgfmt-on-windows
* 'js/msgfmt-on-windows' of ../git-gui:
git-gui (MinGW): make use of MSys2's msgfmt
git gui: allow for a long recentrepo list
git gui: de-dup selected repo from recentrepo history
git gui: cope with duplicates in _get_recentrepo
git-gui: remove duplicate entries from .gitconfig's gui.recentrepo
Diffstat (limited to 'git-gui/Makefile')
| -rw-r--r-- | git-gui/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-gui/Makefile b/git-gui/Makefile index fe30be38dc..918a8de369 100644 --- a/git-gui/Makefile +++ b/git-gui/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 |