aboutsummaryrefslogtreecommitdiff
path: root/git-gui
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-03-07 22:43:46 -0800
committerJunio C Hamano <gitster@pobox.com>2008-03-07 22:43:46 -0800
commit60e3cad92ed93120b9e77116163b267fdda44f91 (patch)
tree240c556d8ce0d95433e4680b6725e5754d098627 /git-gui
parentba51795c5fc32a507df9f91ffeae21893e9e7633 (diff)
parentc8744d6a8b27115503565041566d97c21e722584 (diff)
downloadgit-60e3cad92ed93120b9e77116163b267fdda44f91.tar.gz
git-60e3cad92ed93120b9e77116163b267fdda44f91.tar.xz
Merge branch 'maint'
* maint: unquote_c_style: fix off-by-one. test-lib: fix TERM to dumb for test repeatability config.txt: refer to --upload-pack and --receive-pack instead of --exec git-gui: Gracefully fall back to po2msg.sh if msgfmt --tcl fails
Diffstat (limited to 'git-gui')
-rw-r--r--git-gui/Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/git-gui/Makefile b/git-gui/Makefile
index 01e0a46ba..4e321742a 100644
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@ -224,6 +224,11 @@ else
ifeq ($(shell $(MSGFMT) >/dev/null 2>&1 || echo $$?),127)
MSGFMT := $(TCL_PATH) po/po2msg.sh
endif
+ ifeq (msgfmt,$(MSGFMT))
+ ifeq ($(shell $(MSGFMT) --tcl -l C -d . /dev/null 2>/dev/null || echo $?),1)
+ MSGFMT := $(TCL_PATH) po/po2msg.sh
+ endif
+ endif
endif
msgsdir = $(gg_libdir)/msgs