X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4013-diff-various.sh;h=9337b81064bbdbe4e7f590830b458c48226c4a17;hb=4f2d651e5b3414eac5d22ff47366d22c8cc289f6;hp=6b4d1c52bbf1e3edf01dd67794bf221effc581a7;hpb=30c0312fd182942c10421e77d2b3ec6284cc0468;p=git.git diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 6b4d1c52b..fe6080da5 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -99,7 +99,7 @@ do test=`echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g'` cnt=`expr $test_count + 1` pfx=`printf "%04d" $cnt` - expect="../t4013/diff.$test" + expect="$TEST_DIRECTORY/t4013/diff.$test" actual="$pfx-diff.$test" test_expect_success "git $cmd" ' @@ -112,7 +112,7 @@ do } >"$actual" && if test -f "$expect" then - git diff "$expect" "$actual" && + test_cmp "$expect" "$actual" && rm -f "$actual" else # this is to help developing new tests. @@ -257,6 +257,8 @@ diff --patch-with-raw initial..side diff --patch-with-stat -r initial..side diff --patch-with-raw -r initial..side diff --name-status dir2 dir +diff --no-index --name-status dir2 dir +diff master master^ side EOF test_done