Merge branch 'js/test-help-format-windows-port-fix'

gitster · gitster · commit cbe59df99a69 · 2013-11-01T07:38:51.000-07:00
* js/test-help-format-windows-port-fix:
  t3200: do not open a HTML manual page when DEFAULT_MAN_FORMAT is html
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
@@ -18,7 +18,7 @@ test_expect_success 'prepare a trivial repository' '
 '
 
 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
 '
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ test_expect_success 'prepare a trivial repository' '`
`18`	`18`	`'`
`19`	`19`
`20`	`20`	`test_expect_success 'git branch --help should not have created a bogus branch' '`
`21`		`- test_might_fail git branch --help </dev/null >/dev/null 2>/dev/null &&`
	`21`	`+ test_might_fail git branch --man --help </dev/null >/dev/null 2>&1 &&`
`22`	`22`	`test_path_is_missing .git/refs/heads/--help`
`23`	`23`	`'`
`24`	`24`