From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 1 Feb 2010 02:26:36 +0000 (-0800)
Subject: Meta/Dothem: --dash option builds only with dash
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85ace14c2bdedc72a443b0fb4f80bfe51c1612b8;p=thirdparty%2Fgit.git

Meta/Dothem: --dash option builds only with dash

Earlier one tried to build with /bin/sh and /bin/dash but to do so correctly
we need to 'make clean' in the middle, which is too much overhead to do many
times a day.
---

diff --git a/Dothem b/Dothem
index 3106a30b28..418ec050ce 100755
--- a/Dothem
+++ b/Dothem
@@ -148,18 +148,13 @@ do
 
 		save=$(git rev-parse HEAD) &&
 
-		{
-			test "z$with_dash" != 'zy' ||
-			Meta/Make $M ${test+"$test"} -- $jobs SHELL_PATH=/bin/dash $dotest
-		} &&
-
-		Meta/Make $M ${test+"$test"} -- $jobs $dotest &&
+		Meta/Make $M ${test+"$test"} $jobs -- ${with_dash:+SHELL_PATH=/bin/dash} $dotest &&
 
 		{
 			test -n "$nodoc" ||
 			if test "$save" = "$(git rev-parse HEAD)"
 			then
-				Meta/Make $M -- $jobs doc &&
+				Meta/Make $M $jobs -- doc &&
 				Meta/Make $M -- install-man install-html
 			else
 				echo >&2 "Head moved--not installing docs"
@@ -177,6 +172,6 @@ do
 		} || exit $?
 
 		git reset --hard
-	) || break;
+	) </dev/null || exit $?
 
 done