From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 Aug 2010 18:53:58 +0000 (-0700)
Subject: Merge branch 'ab/tap' into maint
X-Git-Tag: v1.7.2.2~30
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7d808125a0197e5660a57f77d14937604b16e39a?hp=ac2e1e632e50c682305fee902b32b1a23ce71546

Merge branch 'ab/tap' into maint

* ab/tap:
test-lib: Remove 3 year old no-op --no-python option
test-lib: Ignore --quiet under a TAP harness
---

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)