{"thread":{"id":"11743","subject":"[PATCH 8/9] Use git diff instead of diff in t7201","startedAt":"2008-01-25T23:25:07Z","lastAt":"2008-01-26T00:11:18Z","messageCount":3,"participants":["Daniel Barkalow","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":9},"messages":[{"id":"66610","messageId":"alpine.LNX.1.00.0801251824010.13593@iabervon.org","threadId":"11743","inReplyTo":null,"subject":"[PATCH 8/9] Use git diff instead of diff in t7201","fromName":"Daniel Barkalow","fromEmail":"barkalow@iabervon.org","sentAt":"2008-01-25T23:25:07Z","receivedAt":"2008-01-25T23:25:07Z","isPatch":true,"sender":{"key":"barkalow@iabervon.org","avatar":"https://avatars.githubusercontent.com/u/55364219?v=4"},"body":"If the test failed, it was giving really unclear ed script\noutput. Instead, give a diff that sort of suggests the problem.\n\nSigned-off-by: Daniel Barkalow <barkalow@iabervon.org>\n---\n t/t7201-co.sh |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/t/t7201-co.sh b/t/t7201-co.sh\nindex 73d8a00..c6f93a9 100755\n--- a/t/t7201-co.sh\n+++ b/t/t7201-co.sh\n@@ -143,7 +143,7 @@ test_expect_success \"checkout -m with dirty tree, renamed\" '\n \n \tgit checkout -m renamer &&\n \tfill 1 3 4 5 7 8 >expect &&\n-\tdiff expect uno &&\n+\tgit diff expect uno &&\n \t! test -f one &&\n \tgit diff --cached >current &&\n \t! test -s current\n@@ -168,7 +168,7 @@ test_expect_success 'checkout -m with merge conflict' '\n \tgit diff master:one :3:uno |\n \tsed -e \"1,/^@@/d\" -e \"/^ /d\" -e \"s/^-/d/\" -e \"s/^+/a/\" >current &&\n \tfill d2 aT d7 aS >expect &&\n-\tdiff current expect &&\n+\tgit diff current expect &&\n \tgit diff --cached two >current &&\n \t! test -s current\n '\n-- \n1.5.4.rc3.4.g16335\n"},{"id":"66615","messageId":"7v1w855ugx.fsf@gitster.siamese.dyndns.org","threadId":"11743","inReplyTo":"alpine.LNX.1.00.0801251824010.13593@iabervon.org","subject":"Re: [PATCH 8/9] Use git diff instead of diff in t7201","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-01-25T23:57:50Z","receivedAt":"2008-01-25T23:57:50Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Daniel Barkalow <barkalow@iabervon.org> writes:\n\n> If the test failed, it was giving really unclear ed script\n> output. Instead, give a diff that sort of suggests the problem.\n\nHmm.  I'd actually prefer using \"diff -u\" instead.\n"},{"id":"66616","messageId":"alpine.LNX.1.00.0801251910170.13593@iabervon.org","threadId":"11743","inReplyTo":"7v1w855ugx.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH 8/9] Use git diff instead of diff in t7201","fromName":"Daniel Barkalow","fromEmail":"barkalow@iabervon.org","sentAt":"2008-01-26T00:11:18Z","receivedAt":"2008-01-26T00:11:18Z","isPatch":true,"sender":{"key":"barkalow@iabervon.org","avatar":"https://avatars.githubusercontent.com/u/55364219?v=4"},"body":"On Fri, 25 Jan 2008, Junio C Hamano wrote:\n\n> Daniel Barkalow <barkalow@iabervon.org> writes:\n> \n> > If the test failed, it was giving really unclear ed script\n> > output. Instead, give a diff that sort of suggests the problem.\n> \n> Hmm.  I'd actually prefer using \"diff -u\" instead.\n\nShould I change the 4 places that currently use \"git diff\" on a pair of \nfilenames to \"diff -u\"? All 6 places should match, surely.\n\n\t-Daniel\n*This .sig left intentionally blank*\n"}]}