Merge branch 'jc/am-i-v-fix' into maint

diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 890db1174f75172ee6b342e26cbbc58e3e4cd03f..646c4750ec6d3003379da34ee29f247d45cf5b57 100755 (executable)
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -1431,4 +1431,18 @@ test_expect_success 'cover letter auto user override' '
        test_line_count = 2 list
 '
 
+test_expect_success 'format-patch --zero-commit' '
+       git format-patch --zero-commit --stdout v2..v1 >patch2 &&
+       grep "^From " patch2 | sort | uniq >actual &&
+       echo "From $_z40 Mon Sep 17 00:00:00 2001" >expect &&
+       test_cmp expect actual
+'
+
+test_expect_success 'From line has expected format' '
+       git format-patch --stdout v2..v1 >patch2 &&
+       grep "^From " patch2 >from &&
+       grep "^From $_x40 Mon Sep 17 00:00:00 2001$" patch2 >filtered &&
+       test_cmp from filtered
+'
+
 test_done