Merge branch 'nd/init-gitdir'

gitster · gitster · commit 5dee1532e1c8 · 2011-04-12T00:04:53.000-07:00
* nd/init-gitdir:
  t0001: guard a new test with SYMLINKS prerequisite
diff --git a/t/t0001-init.sh b/t/t0001-init.sh
@@ -402,7 +402,7 @@ test_expect_success 're-init to move gitdir' '
 	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 &&
 	(

Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,7 @@ test_expect_success 're-init to move gitdir' '`
`402`	`402`	`test -d realgitdir/refs`
`403`	`403`	`'`
`404`	`404`
`405`		`-test_expect_success 're-init to move gitdir symlink' '`
	`405`	`+test_expect_success SYMLINKS 're-init to move gitdir symlink' '`
`406`	`406`	`rm -rf newdir realgitdir &&`
`407`	`407`	`git init newdir &&`
`408`	`408`	`(`