From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 1 Nov 2013 14:38:51 +0000 (-0700)
Subject: Merge branch 'js/test-help-format-windows-port-fix'
X-Git-Tag: v1.8.5-rc1~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cbe59df99a69069e438aa1d6444036b9cc5d64a2;p=git

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

* js/test-help-format-windows-port-fix:
  t3200: do not open a HTML manual page when DEFAULT_MAN_FORMAT is html
---

cbe59df99a69069e438aa1d6444036b9cc5d64a2
diff --cc t/t3200-branch.sh
index 0fe7647928,bc117aaf33..fcdb867748
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@@ -14,11 -14,10 +14,11 @@@ test_expect_success 'prepare a trivial 
  	echo World >>A &&
  	git update-index --add A &&
  	git commit -m "Second commit." &&
 -	HEAD=$(git rev-parse --verify HEAD)'
 +	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
  '