diff options
| author | Johannes Sixt <j6t@kdbg.org> | 2013-10-26 20:48:46 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-30 12:19:57 -0700 |
| commit | 01e8d327a9d647c1e891920365c5f6b4f595d5e9 (patch) | |
| tree | 9e5257abbfb41b56bce1f2add3d875f1eea66609 | |
| parent | ca462804c68b5ac0936242d4938fc9273b00180d (diff) | |
| download | git-js/test-help-format-windows-port-fix.tar.gz | |
t3200: do not open a HTML manual page when DEFAULT_MAN_FORMAT is htmljs/test-help-format-windows-port-fix
We have the build configuration option DEFAULT_MAN_FORMAT to choose a
format different from man pages to be used by 'git help' when no format
is requested explicitly. Since 65db0443 (Set the default help format to
html for msys builds, 2013-06-04) we use html on Windows by default.
There is one test in t3200-branch.sh that invokes a help page. The
intent of the redirections applied to the command invocation is to avoid
that the man page viewer interferes with the automated test. But when
the default format is not "man", this does not have the intended effect,
and the HTML manual page is opened during the test run. Request "man"
format explicitly to keep the test silent.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t3200-branch.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 55c9ab0b6a..bc117aaf33 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -17,7 +17,7 @@ test_expect_success 'prepare a trivial repository' ' HEAD=$(git rev-parse --verify HEAD)' test_expect_success 'git branch --help should not have created a bogus branch' ' - test_might_fail git branch --help </dev/null >/dev/null 2>/dev/null && + test_might_fail git branch --man --help </dev/null >/dev/null 2>&1 && test_path_is_missing .git/refs/heads/--help ' |