[PATCH 8/9] Use git diff instead of diff in t7201
From: Daniel Barkalow <hidden>
Date: 2016-06-15 22:44:08
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 <redacted> --- 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