From 5b82b4297f5ad649213a38098636b7e1e2787db7 Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Sat, 6 Jul 2013 19:24:01 +0200 Subject: [PATCH] t3200: do not open a HTML manual page when DEFAULT_MAN_FORMAT is html 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 Signed-off-by: Johannes Schindelin --- t/t3200-branch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index d969f0ecd8..deaeaa7d8f 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 2>/dev/null && + test_might_fail git branch --man --help /dev/null 2>&1 && test_path_is_missing .git/refs/heads/--help '