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

diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 04385a7250fa0f5c68a469ef72b68953aafb78d7..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 &&