mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
Use diff -u instead of diff in t7201
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:
parent
e496c00348
commit
922d87f92f
|
@ -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 &&
|
||||
cp same kept
|
||||
git checkout side >messages &&
|
||||
git diff same kept
|
||||
diff -u same kept
|
||||
(cat > messages.expect <<EOF
|
||||
M same
|
||||
EOF
|
||||
) &&
|
||||
touch messages.expect &&
|
||||
git diff messages.expect messages
|
||||
diff -u messages.expect messages
|
||||
'
|
||||
|
||||
test_expect_success "checkout -m with dirty tree" '
|
||||
|
@ -113,19 +113,19 @@ Auto-merged one
|
|||
M one
|
||||
EOF
|
||||
) &&
|
||||
git diff expect.messages messages &&
|
||||
diff -u expect.messages messages &&
|
||||
|
||||
fill "M one" "A three" "D two" >expect.master &&
|
||||
git diff --name-status master >current.master &&
|
||||
diff expect.master current.master &&
|
||||
diff -u expect.master current.master &&
|
||||
|
||||
fill "M one" >expect.side &&
|
||||
git diff --name-status side >current.side &&
|
||||
diff expect.side current.side &&
|
||||
diff -u expect.side current.side &&
|
||||
|
||||
: >expect.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" '
|
||||
|
@ -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 &&
|
||||
diff -u 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 &&
|
||||
diff -u current expect &&
|
||||
git diff --cached two >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
|
||||
EOF
|
||||
) &&
|
||||
git diff messages.expect messages &&
|
||||
diff -u messages.expect messages &&
|
||||
H=$(git rev-parse --verify HEAD) &&
|
||||
M=$(git show-ref -s --verify refs/heads/master) &&
|
||||
test "z$H" = "z$M" &&
|
||||
|
|
Loading…
Reference in a new issue