undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use diff -u instead of diff in t7201

Browse Source 
If the test failed, it was giving really unclear ed script
output. Instead, give a diff that sort of suggests the problem. Also
replaces the use of "git diff" for this purpose with "diff -u".

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
This commit is contained in:
Daniel Barkalow 2008-02-07 11:40:11 -05:00 committed by Junio C Hamano
parent e496c00348
commit 922d87f92f
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
t/t7201-co.sh
View File

@ -83,13 +83,13 @@ test_expect_success "checkout with unrelated dirty tree without -m" '
fill 0 1 2 3 4 5 6 7 8 >same && fill 0 1 2 3 4 5 6 7 8 >same &&
cp same kept cp same kept
git checkout side >messages && git checkout side >messages &&
git diff same kept diff -u same kept
(cat > messages.expect <<EOF (cat > messages.expect <<EOF
M same M same
EOF EOF
) && ) &&
touch messages.expect && touch messages.expect &&
git diff messages.expect messages diff -u messages.expect messages
' '
test_expect_success "checkout -m with dirty tree" ' test_expect_success "checkout -m with dirty tree" '
@ -113,19 +113,19 @@ Auto-merged one
M one M one
EOF EOF
) && ) &&
git diff expect.messages messages && diff -u expect.messages messages &&
fill "M one" "A three" "D two" >expect.master && fill "M one" "A three" "D two" >expect.master &&
git diff --name-status master >current.master && git diff --name-status master >current.master &&
diff expect.master current.master && diff -u expect.master current.master &&
fill "M one" >expect.side && fill "M one" >expect.side &&
git diff --name-status side >current.side && git diff --name-status side >current.side &&
diff expect.side current.side && diff -u expect.side current.side &&
: >expect.index && : >expect.index &&
git diff --cached >current.index && git diff --cached >current.index &&
diff expect.index current.index diff -u expect.index current.index
' '
test_expect_success "checkout -m with dirty tree, renamed" ' test_expect_success "checkout -m with dirty tree, renamed" '
@ -143,7 +143,7 @@ test_expect_success "checkout -m with dirty tree, renamed" '
git checkout -m renamer && git checkout -m renamer &&
fill 1 3 4 5 7 8 >expect && fill 1 3 4 5 7 8 >expect &&
diff expect uno && diff -u expect uno &&
! test -f one && ! test -f one &&
git diff --cached >current && git diff --cached >current &&
! test -s current ! test -s current
@ -168,7 +168,7 @@ test_expect_success 'checkout -m with merge conflict' '
git diff master:one :3:uno | git diff master:one :3:uno |
sed -e "1,/^@@/d" -e "/^ /d" -e "s/^-/d/" -e "s/^+/a/" >current && sed -e "1,/^@@/d" -e "/^ /d" -e "s/^-/d/" -e "s/^+/a/" >current &&
fill d2 aT d7 aS >expect && fill d2 aT d7 aS >expect &&
diff current expect && diff -u current expect &&
git diff --cached two >current && git diff --cached two >current &&
! test -s current ! test -s current
' '
@ -185,7 +185,7 @@ If you want to create a new branch from this checkout, you may do so
HEAD is now at 7329388... Initial A one, A two HEAD is now at 7329388... Initial A one, A two
EOF EOF
) && ) &&
git diff messages.expect messages && diff -u messages.expect messages &&
H=$(git rev-parse --verify HEAD) && H=$(git rev-parse --verify HEAD) &&
M=$(git show-ref -s --verify refs/heads/master) && M=$(git show-ref -s --verify refs/heads/master) &&
test "z$H" = "z$M" && test "z$H" = "z$M" &&