{"thread":{"id":"11949","subject":"[PATCH v2 08/11] Use diff -u instead of diff in t7201","startedAt":"2008-02-07T16:40:11Z","lastAt":"2008-02-07T16:40:11Z","messageCount":1,"participants":["Daniel Barkalow"],"isPatch":true,"patchVersion":2,"patchTotal":11},"messages":[{"id":"67829","messageId":"alpine.LNX.1.00.0802071133380.13593@iabervon.org","threadId":"11949","inReplyTo":null,"subject":"[PATCH v2 08/11] Use diff -u instead of diff in t7201","fromName":"Daniel Barkalow","fromEmail":"barkalow@iabervon.org","sentAt":"2008-02-07T16:40:11Z","receivedAt":"2008-02-07T16:40:11Z","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. Also \nreplaces the use of \"git diff\" for this purpose with \"diff -u\".\n\nSigned-off-by: Daniel Barkalow <barkalow@iabervon.org>\n---\n t/t7201-co.sh |   18 +++++++++---------\n 1 files changed, 9 insertions(+), 9 deletions(-)\n\ndiff --git a/t/t7201-co.sh b/t/t7201-co.sh\nindex dbf1ace..42cf0ab 100755\n--- a/t/t7201-co.sh\n+++ b/t/t7201-co.sh\n@@ -83,13 +83,13 @@ test_expect_success \"checkout with unrelated dirty tree without -m\" '\n \tfill 0 1 2 3 4 5 6 7 8 >same &&\n \tcp same kept\n \tgit checkout side >messages &&\n-\tgit diff same kept\n+\tdiff -u same kept\n \t(cat > messages.expect <<EOF\n M\tsame\n EOF\n ) &&\n \ttouch messages.expect &&\n-\tgit diff messages.expect messages\n+\tdiff -u messages.expect messages\n '\n \n test_expect_success \"checkout -m with dirty tree\" '\n@@ -113,19 +113,19 @@ Auto-merged one\n M\tone\n EOF\n ) &&\n-\tgit diff expect.messages messages &&\n+\tdiff -u expect.messages messages &&\n \n \tfill \"M\tone\" \"A\tthree\" \"D\ttwo\" >expect.master &&\n \tgit diff --name-status master >current.master &&\n-\tdiff expect.master current.master &&\n+\tdiff -u expect.master current.master &&\n \n \tfill \"M\tone\" >expect.side &&\n \tgit diff --name-status side >current.side &&\n-\tdiff expect.side current.side &&\n+\tdiff -u expect.side current.side &&\n \n \t: >expect.index &&\n \tgit diff --cached >current.index &&\n-\tdiff expect.index current.index\n+\tdiff -u expect.index current.index\n '\n \n test_expect_success \"checkout -m with dirty tree, renamed\" '\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+\tdiff -u 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+\tdiff -u current expect &&\n \tgit diff --cached two >current &&\n \t! test -s current\n '\n@@ -185,7 +185,7 @@ If you want to create a new branch from this checkout, you may do so\n HEAD is now at 7329388... Initial A one, A two\n EOF\n ) &&\n-\tgit diff messages.expect messages &&\n+\tdiff -u messages.expect messages &&\n \tH=$(git rev-parse --verify HEAD) &&\n \tM=$(git show-ref -s --verify refs/heads/master) &&\n \ttest \"z$H\" = \"z$M\" &&\n-- \n1.5.4\n"}]}