Merge branch 'maint-1.6.0' into maint

diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index b53645417b9f4cdf59338f47104acfc3a0c4d702..0ab925c4e4710a560f0d35e47ccdda8ddb2b8212 100755 (executable)
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -69,6 +69,29 @@ test_expect_success 'diff-filter=D' '
 
 '
 
+test_expect_success 'setup case sensitivity tests' '
+       echo case >one &&
+       test_tick &&
+       git commit -a -m Second
+'
+
+test_expect_success 'log --grep' '
+       echo second >expect &&
+       git log -1 --pretty="tformat:%s" --grep=sec >actual &&
+       test_cmp expect actual
+'
+
+test_expect_success 'log -i --grep' '
+       echo Second >expect &&
+       git log -1 --pretty="tformat:%s" -i --grep=sec >actual &&
+       test_cmp expect actual
+'
+
+test_expect_success 'log --grep -i' '
+       echo Second >expect &&
+       git log -1 --pretty="tformat:%s" --grep=sec -i >actual &&
+       test_cmp expect actual
+'
 
+test_done
 
-test_done
\ No newline at end of file