threads / patch / 11743

patch, 9 partsUse git diff instead of diff in t7201

Subject: [PATCH 8/9] Use git diff instead of diff in t7201

## tl;dr

3 messages between Jan 25, 2008 and Jan 26, 2008. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Daniel Barkalow· Jan 25, 2008, 23:25 UTC · lore

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 <barkalow@iabervon.org>
---
 t/t7201-co.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Show changes to t/t7201-co.sh +2 −2

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.rc3.4.g16335

Junio C Hamano· Jan 25, 2008, 23:57 UTC · re: Daniel Barkalow · lore

Re: [PATCH 8/9] Use git diff instead of diff in t7201

Daniel Barkalow <barkalow@iabervon.org> writes:

> If the test failed, it was giving really unclear ed script
> output. Instead, give a diff that sort of suggests the problem.

Hmm.  I'd actually prefer using "diff -u" instead.

Daniel Barkalow· Jan 26, 2008, 00:11 UTC · re: Junio C Hamano · lore

Re: [PATCH 8/9] Use git diff instead of diff in t7201

On Fri, 25 Jan 2008, Junio C Hamano wrote:

Show 6 quoted lines

> Daniel Barkalow <barkalow@iabervon.org> writes:
> 
> > If the test failed, it was giving really unclear ed script
> > output. Instead, give a diff that sort of suggests the problem.
> 
> Hmm.  I'd actually prefer using "diff -u" instead.

Should I change the 4 places that currently use "git diff" on a pair of filenames to "diff -u"? All 6 places should match, surely.

	-Daniel
*This .sig left intentionally blank*