From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Aug 2010 22:16:38 +0000 (-0700)
Subject: Merge branch 'pt/git-gui' into maint
X-Git-Tag: v1.7.2.2~29
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e9aa24123d0ff8914a34a9f40f23bf736ec2bfb7?hp=c01a29c74ff991faf3012882fbf676b182b8893f

Merge branch 'pt/git-gui' into maint

* pt/git-gui:
git-gui: fix size and position of window panes on startup
git-gui: mc cannot be used before msgcat has been loaded
git-gui: use textconv filter for diff and blame
git-gui: Avoid using the <<Copy>> binding as a menu accelerator on win32
git-gui: fix shortcut creation on cygwin
git-gui: fix PATH environment for mingw development environment
git-gui: fix usage of _gitworktree when creating shortcut for windows
git-gui: fix "Explore Working Copy" for Windows again
git-gui: fix usage of themed widgets variable
git-gui: Handle failure of core.worktree to identify the working directory.
git-gui: check whether systems nice command works or disable it
---

diff --git a/t/test-lib.sh b/t/test-lib.sh
index e5523dd690..e8f21d577c 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -127,14 +127,13 @@ do
 	-v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
 		verbose=t; shift ;;
 	-q|--q|--qu|--qui|--quie|--quiet)
-		quiet=t; shift ;;
+		# Ignore --quiet under a TAP::Harness. Saying how many tests
+		# passed without the ok/not ok details is always an error.
+		test -z "$HARNESS_ACTIVE" && quiet=t; shift ;;
 	--with-dashes)
 		with_dashes=t; shift ;;
 	--no-color)
 		color=; shift ;;
-	--no-python)
-		# noop now...
-		shift ;;
 	--va|--val|--valg|--valgr|--valgri|--valgrin|--valgrind)
 		valgrind=t; verbose=t; shift ;;
 	--tee)