From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 12 Apr 2011 07:04:53 +0000 (-0700)
Subject: Merge branch 'nd/init-gitdir'
X-Git-Tag: v1.7.5-rc2~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5dee1532e1c8e8eb31bfa437b5ff00ea0acb6f08?ds=inline;hp=-c

Merge branch 'nd/init-gitdir'

* nd/init-gitdir:
t0001: guard a new test with SYMLINKS prerequisite
---

5dee1532e1c8e8eb31bfa437b5ff00ea0acb6f08
diff --combined t/t0001-init.sh
index a5816d0e4f,21caba7698..54520f6fa6
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@@ -47,7 -47,7 +47,7 @@@ test_expect_success 'plain nested in ba
  
  test_expect_success 'plain through aliased command, outside any git repo' '
  	(
 -		sane_unset GIT_DIR GIT_WORK_TREE GIT_CONFIG_NOGLOBAL &&
 +		sane_unset GIT_DIR GIT_WORK_TREE &&
  		HOME=$(pwd)/alias-config &&
  		export HOME &&
  		mkdir alias-config &&
@@@ -180,7 -180,7 +180,7 @@@ test_expect_success 'GIT_DIR & GIT_WORK
  	fi
  '
  
 -test_expect_success 'reinit' '
 +test_expect_success C_LOCALE_OUTPUT 'reinit' '
  
  	(
  		sane_unset GIT_CONFIG GIT_WORK_TREE GIT_CONFIG &&
@@@ -231,6 -231,7 +231,6 @@@ test_expect_success 'init with init.tem
  		git config -f "$test_config"  init.templatedir "${HOME}/templatedir-source" &&
  		mkdir templatedir-set &&
  		cd templatedir-set &&
 -		sane_unset GIT_CONFIG_NOGLOBAL &&
  		sane_unset GIT_TEMPLATE_DIR &&
  		NO_SET_GIT_TEMPLATE_DIR=t &&
  		export NO_SET_GIT_TEMPLATE_DIR &&
@@@ -242,6 -243,7 +242,6 @@@
  test_expect_success 'init --bare/--shared overrides system/global config' '
  	(
  		test_config="$HOME"/.gitconfig &&
 -		sane_unset GIT_CONFIG_NOGLOBAL &&
  		git config -f "$test_config" core.bare false &&
  		git config -f "$test_config" core.sharedRepository 0640 &&
  		mkdir init-bare-shared-override &&
@@@ -256,6 -258,7 +256,6 @@@
  test_expect_success 'init honors global core.sharedRepository' '
  	(
  		test_config="$HOME"/.gitconfig &&
 -		sane_unset GIT_CONFIG_NOGLOBAL &&
  		git config -f "$test_config" core.sharedRepository 0666 &&
  		mkdir shared-honor-global &&
  		cd shared-honor-global &&
@@@ -402,7 -405,7 +402,7 @@@ test_expect_success 're-init to move gi
  	test -d realgitdir/refs
  '
  
- test_expect_success 're-init to move gitdir symlink' '
+ test_expect_success SYMLINKS 're-init to move gitdir symlink' '
  	rm -rf newdir realgitdir &&
  	git init newdir &&
  	(