Merge branch 'rf/maint-mailmap-off-by-one'

diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index b3ac6be3b0d2cc47af4559bcf7401ef858dae322..e6537abe1d611aa2d96215fb263f76c5c0cf3b1a 100755 (executable)
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -230,6 +230,12 @@ test_expect_success 'log --grep -i' '
        test_cmp expect actual
 '
 
+test_expect_success 'log -F -E --grep=<ere> uses ere' '
+       echo second >expect &&
+       git log -1 --pretty="tformat:%s" -F -E --grep=s.c.nd >actual &&
+       test_cmp expect actual
+'
+
 cat > expect <<EOF
 * Second
 * sixth
@@ -813,7 +819,7 @@ sanitize_output () {
 test_expect_success 'log --graph with diff and stats' '
        git log --graph --pretty=short --stat -p >actual &&
        sanitize_output >actual.sanitized <actual &&
-       test_cmp expect actual.sanitized
+       test_i18ncmp expect actual.sanitized
 '
 
 test_expect_success 'dotdot is a parent directory' '