# [PATCH 8/9] Use git diff instead of diff in t7201 3 messages from 2008-01-25 to 2008-01-26. Participants: Daniel Barkalow, Junio C Hamano. Thread: https://gitlist.dev/t/11743 ## Daniel Barkalow, 2008-01-25 23:25 Subject: [PATCH 8/9] Use git diff instead of diff in t7201 Message-ID: URL: https://gitlist.dev/e/alpine.LNX.1.00.0801251824010.13593%40iabervon.org ``` 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.rc3.4.g16335 ``` ## Junio C Hamano, 2008-01-25 23:57 Subject: Re: [PATCH 8/9] Use git diff instead of diff in t7201 Message-ID: <7v1w855ugx.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7v1w855ugx.fsf%40gitster.siamese.dyndns.org In-Reply-To: ``` Daniel Barkalow 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, 2008-01-26 00:11 Subject: Re: [PATCH 8/9] Use git diff instead of diff in t7201 Message-ID: URL: https://gitlist.dev/e/alpine.LNX.1.00.0801251910170.13593%40iabervon.org In-Reply-To: <7v1w855ugx.fsf@gitster.siamese.dyndns.org> ``` On Fri, 25 Jan 2008, Junio C Hamano wrote: > Daniel Barkalow 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* ```