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://git.lorimer.id.au/gitweb.git/diff_plain/cbe59df99a69069e438aa1d6444036b9cc5d64a2?hp=-c

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 --combined 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
  '
  
@@@ -352,7 -351,7 +352,7 @@@ test_expect_success 'test overriding tr
  test_expect_success 'no tracking without .fetch entries' '
  	git config branch.autosetupmerge true &&
  	git branch my6 s &&
 -	git config branch.automsetupmerge false &&
 +	git config branch.autosetupmerge false &&
  	test -z "$(git config branch.my6.remote)" &&
  	test -z "$(git config branch.my6.merge)"
  '
@@@ -426,14 -425,14 +426,14 @@@ test_expect_success '--set-upstream-to 
  test_expect_success 'use --set-upstream-to modify HEAD' '
  	test_config branch.master.remote foo &&
  	test_config branch.master.merge foo &&
 -	git branch my12
 +	git branch my12 &&
  	git branch --set-upstream-to my12 &&
  	test "$(git config branch.master.remote)" = "." &&
  	test "$(git config branch.master.merge)" = "refs/heads/my12"
  '
  
  test_expect_success 'use --set-upstream-to modify a particular branch' '
 -	git branch my13
 +	git branch my13 &&
  	git branch --set-upstream-to master my13 &&
  	test "$(git config branch.my13.remote)" = "." &&
  	test "$(git config branch.my13.merge)" = "refs/heads/master"
@@@ -444,7 -443,7 +444,7 @@@ test_expect_success '--unset-upstream s
  '
  
  test_expect_success 'test --unset-upstream on HEAD' '
 -	git branch my14
 +	git branch my14 &&
  	test_config branch.master.remote foo &&
  	test_config branch.master.merge foo &&
  	git branch --set-upstream-to my14 &&
@@@ -466,7 -465,7 +466,7 @@@ test_expect_success '--unset-upstream s
  '
  
  test_expect_success 'test --unset-upstream on a particular branch' '
 -	git branch my15
 +	git branch my15 &&
  	git branch --set-upstream-to master my14 &&
  	git branch --unset-upstream my14 &&
  	test_must_fail git config branch.my14.remote &&