Merge git://repo.or.cz/git-gui

diff --git a/t/t5100-mailinfo.sh b/t/t5100-mailinfo.sh
index a8b78ebf7d021cb626d4452545b5f4d1e0efe34f..e9f3e72c7ee5584d956d46126956c641a7d53905 100755 (executable)
--- a/t/t5100-mailinfo.sh
+++ b/t/t5100-mailinfo.sh
@@ -11,7 +11,7 @@ test_expect_success 'split sample box' \
        'git mailsplit -o. ../t5100/sample.mbox >last &&
        last=`cat last` &&
        echo total is $last &&
-       test `cat last` = 9'
+       test `cat last` = 10'
 
 for mail in `echo 00*`
 do
@@ -27,8 +27,8 @@ done
 
 test_expect_success 'respect NULs' '
 
-       git mailsplit -d3 -o. ../t5100/nul &&
-       cmp ../t5100/nul 001 &&
+       git mailsplit -d3 -o. ../t5100/nul-plain &&
+       cmp ../t5100/nul-plain 001 &&
        (cat 001 | git mailinfo msg patch) &&
        test 4 = $(wc -l < patch)