From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Barkalow Subject: [PATCH 8/9] Use git diff instead of diff in t7201 Date: Mon, 4 Feb 2008 13:36:04 -0500 (EST) Message-ID: Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: git@vger.kernel.org To: Junio C Hamano X-From: git-owner@vger.kernel.org Mon Feb 04 19:36:58 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1JM6BW-0006Qr-Jq for gcvg-git-2@gmane.org; Mon, 04 Feb 2008 19:36:51 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754533AbYBDSgK (ORCPT ); Mon, 4 Feb 2008 13:36:10 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754630AbYBDSgI (ORCPT ); Mon, 4 Feb 2008 13:36:08 -0500 Received: from iabervon.org ([66.92.72.58]:51158 "EHLO iabervon.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754533AbYBDSgG (ORCPT ); Mon, 4 Feb 2008 13:36:06 -0500 Received: (qmail 8378 invoked by uid 1000); 4 Feb 2008 18:36:04 -0000 Received: from localhost (sendmail-bs@127.0.0.1) by localhost with SMTP; 4 Feb 2008 18:36:04 -0000 User-Agent: Alpine 1.00 (LNX 882 2007-12-20) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: If the test failed, it was giving really unclear ed script output. Instead, give a diff that sort of suggests the problem. Signed-off-by: Daniel Barkalow --- t/t7201-co.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t7201-co.sh b/t/t7201-co.sh index 73d8a00..c6f93a9 100755 --- a/t/t7201-co.sh +++ b/t/t7201-co.sh @@ -143,7 +143,7 @@ test_expect_success "checkout -m with dirty tree, renamed" ' git checkout -m renamer && fill 1 3 4 5 7 8 >expect && - diff expect uno && + git diff expect uno && ! test -f one && git diff --cached >current && ! test -s current @@ -168,7 +168,7 @@ test_expect_success 'checkout -m with merge conflict' ' git diff master:one :3:uno | sed -e "1,/^@@/d" -e "/^ /d" -e "s/^-/d/" -e "s/^+/a/" >current && fill d2 aT d7 aS >expect && - diff current expect && + git diff current expect && git diff --cached two >current && ! test -s current ' -- 1.5.4