diff-highlight: ignore test cruft

diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index f10ba4a01e7e9468b9656ee54486209151ecfd4f..1aa5093f36ea61a75cb11de5a65ed11b2b3b4e65 100755 (executable)
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -98,7 +98,7 @@ check_sub_test_lib_test () {
 }
 
 check_sub_test_lib_test_err () {
-       name="$1" # stdin is the expected output output from the test
+       name="$1" # stdin is the expected output from the test
        # expected error output is in descriptior 3
        (
                cd "$name" &&
@@ -253,7 +253,7 @@ test_expect_success 'test --verbose' '
        test_expect_success "failing test" false
        test_done
        EOF
-       mv test-verbose/out test-verbose/out+
+       mv test-verbose/out test-verbose/out+ &&
        grep -v "^Initialized empty" test-verbose/out+ >test-verbose/out &&
        check_sub_test_lib_test test-verbose <<-\EOF
        > expecting success: true
@@ -834,7 +834,7 @@ test_expect_success 'git write-tree should be able to write an empty tree' '
 '
 
 test_expect_success 'validate object ID of a known tree' '
-       test "$tree" = 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+       test "$tree" = $EMPTY_TREE
 '
 
 # Various types of objects
@@ -974,7 +974,7 @@ test_expect_success 'writing this tree with --missing-ok' '
 
 ################################################################
 test_expect_success 'git read-tree followed by write-tree should be idempotent' '
-       rm -f .git/index
+       rm -f .git/index &&
        git read-tree $tree &&
        test -f .git/index &&
        newtree=$(git write-tree) &&