Merge branch 'jk/asciidoc-markup-fix'

diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index da958a8b569e6e8ad0c4d2e20b0454a0180155cc..947b690fd7fcaae6f2584b0752adfecfc0c1af89 100755 (executable)
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -396,7 +396,7 @@ test_expect_success TTY 'command-specific pager overrides core.pager' '
        sane_unset PAGER GIT_PAGER &&
        echo "foo:initial" >expect &&
        >actual &&
-       test_config core.pager "exit 1"
+       test_config core.pager "exit 1" &&
        test_config pager.log "sed s/^/foo:/ >actual" &&
        test_terminal git log --format=%s -1 &&
        test_cmp expect actual