From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 2 Apr 2009 17:18:29 +0000 (-0700)
Subject: Dothem: fix dotest/nodoc conditional
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=411b5ebe488162e45606a10b7371c75e6e55e443;p=thirdparty%2Fgit.git

Dothem: fix dotest/nodoc conditional

The test for nodoc was wrong and also missing from jch branch.
When dotest is not set, make was run twice.  By running make with
just $dotest, we can build either (implicit) all or test.
---

diff --git a/Dothem b/Dothem
index 9425b68c7d..c503a3767d 100755
--- a/Dothem
+++ b/Dothem
@@ -91,14 +91,13 @@ do
 			;;
 		esac &&
 
-		Meta/Make $M -- $J all &&
 		Meta/Make $M -- $J $dotest &&
 		case "$branch" in
 		jch)
-			Meta/Make $M -- doc install-doc
+			test -n "$nodoc" || Meta/Make $M -- doc install-doc
 			;;
 		master | maint | next )
-			test -z "$nodoc" || Meta/Make $M -- doc
+			test -n "$nodoc" || Meta/Make $M -- doc
 			;;
 		*)
 			: ;;