git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 8/9] Use git diff instead of diff in t7201
@ 2008-01-25 23:25 Daniel Barkalow
  2008-01-25 23:57 ` Junio C Hamano
  0 siblings, 1 reply; 11+ messages in thread
From: Daniel Barkalow @ 2008-01-25 23:25 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

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(-)

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

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [PATCH 8/9] Use git diff instead of diff in t7201
@ 2008-02-04 18:36 Daniel Barkalow
  2008-02-05  1:40 ` Johannes Schindelin
  0 siblings, 1 reply; 11+ messages in thread
From: Daniel Barkalow @ 2008-02-04 18:36 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

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(-)

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

^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2008-02-06  5:22 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-01-25 23:25 [PATCH 8/9] Use git diff instead of diff in t7201 Daniel Barkalow
2008-01-25 23:57 ` Junio C Hamano
2008-01-26  0:11   ` Daniel Barkalow
  -- strict thread matches above, loose matches on Subject: below --
2008-02-04 18:36 Daniel Barkalow
2008-02-05  1:40 ` Johannes Schindelin
2008-02-05 20:39   ` Daniel Barkalow
2008-02-05 23:44     ` Junio C Hamano
2008-02-06  1:13       ` Daniel Barkalow
2008-02-06  2:10         ` Junio C Hamano
2008-02-06  4:30           ` Daniel Barkalow
2008-02-06  5:21             ` Junio C Hamano

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).