Merge branch 'jk/http-error-messages'

diff --git a/t/t4209-log-pickaxe.sh b/t/t4209-log-pickaxe.sh
index eed727341dca4cd16a2558644506573885baccd9..38fb80f643534a2bd724e13ef271f90167ac11a3 100755 (executable)
--- a/t/t4209-log-pickaxe.sh
+++ b/t/t4209-log-pickaxe.sh
@@ -80,6 +80,20 @@ test_expect_success 'log -G -i (match)' '
        test_cmp expect actual
 '
 
+test_expect_success 'log -G --textconv (missing textconv tool)' '
+       echo "* diff=test" >.gitattributes &&
+       test_must_fail git -c diff.test.textconv=missing log -Gfoo &&
+       rm .gitattributes
+'
+
+test_expect_success 'log -G --no-textconv (missing textconv tool)' '
+       echo "* diff=test" >.gitattributes &&
+       git -c diff.test.textconv=missing log -Gfoo --no-textconv >actual &&
+       >expect &&
+       test_cmp expect actual &&
+       rm .gitattributes
+'
+
 test_expect_success 'log -S (nomatch)' '
        git log -Spicked --format=%H >actual &&
        >expect &&
@@ -116,4 +130,18 @@ test_expect_success 'log -S -i (nomatch)' '
        test_cmp expect actual
 '
 
+test_expect_success 'log -S --textconv (missing textconv tool)' '
+       echo "* diff=test" >.gitattributes &&
+       test_must_fail git -c diff.test.textconv=missing log -Sfoo &&
+       rm .gitattributes
+'
+
+test_expect_success 'log -S --no-textconv (missing textconv tool)' '
+       echo "* diff=test" >.gitattributes &&
+       git -c diff.test.textconv=missing log -Sfoo --no-textconv >actual &&
+       >expect &&
+       test_cmp expect actual &&
+       rm .gitattributes
+'
+
 test_done