Merge branch 'sb/mailmap-freeing-NULL-is-ok'

diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index f4b93557a6f76a9691ee81d57557d0c2192e5087..31a770d9bc58d7c01d69f7817fcbc06622859662 100755 (executable)
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -1050,7 +1050,7 @@ cat >expect <<EOF
 :100755 100755 e74b7d465e52746be2b4bae983670711e6e66657 e74b7d465e52746be2b4bae983670711e6e66657 R100  newdir/exec.sh  sub/newdir/exec.sh
 :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 R100  newdir/interesting      sub/newdir/interesting
 EOF
-test_expect_failure \
+test_expect_success \
        'M: rename root to subdirectory' \
        'git fast-import <input &&
         git diff-tree -M -r M4^ M4 >actual &&
@@ -1253,7 +1253,7 @@ test_expect_success \
         git diff-tree -C --find-copies-harder -r N4 N6 >actual &&
         compare_diff_raw expect actual'
 
-test_expect_failure \
+test_expect_success \
        'N: copy root by path' \
        'cat >expect <<-\EOF &&
        :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100   file2/newf      oldroot/file2/newf
@@ -2988,7 +2988,7 @@ test_expect_success 'S: ls with garbage after sha1 must fail' '
 ###
 # Setup is carried over from series S.
 
-test_expect_failure 'T: ls root tree' '
+test_expect_success 'T: ls root tree' '
        sed -e "s/Z\$//" >expect <<-EOF &&
        040000 tree $(git rev-parse S^{tree})   Z
        EOF