From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dennis Stosberg Subject: [PATCH] Make t4101-apply-nonl bring along its patches Date: Sat, 17 Jun 2006 17:02:45 +0200 Message-ID: <20060617150245.G2842888b@leonov.stosberg.net> References: <20060617130957.G199de590@leonov.stosberg.net> <200606171446.k5HEkZAx006686@grail.cba.csuohio.edu> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org, rene.scharfe@lsrfire.ath.cx X-From: git-owner@vger.kernel.org Sat Jun 17 17:03:09 2006 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1FrcKJ-00086W-V2 for gcvg-git@gmane.org; Sat, 17 Jun 2006 17:03:08 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751659AbWFQPDE (ORCPT ); Sat, 17 Jun 2006 11:03:04 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751661AbWFQPDE (ORCPT ); Sat, 17 Jun 2006 11:03:04 -0400 Received: from ncs.stosberg.net ([89.110.145.104]:29057 "EHLO ncs.stosberg.net") by vger.kernel.org with ESMTP id S1751659AbWFQPDD (ORCPT ); Sat, 17 Jun 2006 11:03:03 -0400 Received: from leonov.stosberg.net (p213.54.79.58.tisdip.tiscali.de [213.54.79.58]) by ncs.stosberg.net (Postfix) with ESMTP id 432FDAEBA005; Sat, 17 Jun 2006 17:02:41 +0200 (CEST) Received: by leonov.stosberg.net (Postfix, from userid 500) id CD00210C6F1; Sat, 17 Jun 2006 17:02:45 +0200 (CEST) To: Michael Somos Content-Disposition: inline In-Reply-To: <200606171446.k5HEkZAx006686@grail.cba.csuohio.edu> OpenPGP: id=1B2F2863BA13A814C3B133DACC2811F494951CAB; url=http://stosberg.net/dennis.asc User-Agent: mutt-ng/devel-r802 (Debian) Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Some versions of "diff" (e.g. on FreeBSD and older Linux systems) do not support the "\ No newline at end of file" remark and are not able to generate the patches needed for this test. This lets the test fail, although git-apply is working perfectly. This patch adds the pre-generated patches to t/t4100/ and makes the test use them. Signed-off-by: Dennis Stosberg --- t/t4101-apply-nonl.sh | 6 +----- t/t4101/diff.0-1 | 6 ++++++ t/t4101/diff.0-2 | 7 +++++++ t/t4101/diff.0-3 | 8 ++++++++ t/t4101/diff.1-0 | 6 ++++++ t/t4101/diff.1-2 | 8 ++++++++ t/t4101/diff.1-3 | 8 ++++++++ t/t4101/diff.2-0 | 7 +++++++ t/t4101/diff.2-1 | 8 ++++++++ t/t4101/diff.2-3 | 7 +++++++ t/t4101/diff.3-0 | 8 ++++++++ t/t4101/diff.3-1 | 8 ++++++++ t/t4101/diff.3-2 | 7 +++++++ 13 files changed, 89 insertions(+), 5 deletions(-) diff --git a/t/t4101-apply-nonl.sh b/t/t4101-apply-nonl.sh index 26b131d..026fac8 100755 --- a/t/t4101-apply-nonl.sh +++ b/t/t4101-apply-nonl.sh @@ -20,14 +20,10 @@ do for j in 0 1 2 3 do test $i -eq $j && continue - diff -u frotz.$i frotz.$j | - sed -e ' - /^---/s|.*|--- a/frotz| - /^+++/s|.*|+++ b/frotz|' >diff.$i-$j cat frotz.$i >frotz test_expect_success \ "apply diff between $i and $j" \ - "git-apply