Merge branch 'maint'

* maint: init/clone: remove short option -L and document --separate-git-dir
2011-05-25 15:25:44 -07:00
parent f612a71cc9 09ffc706e4
commit 6741c2e64a
6 changed files with 6 additions and 8 deletions
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@ -409,7 +409,7 @@ test_expect_success SYMLINKS 're-init to move gitdir symlink' '
 	cd newdir &&
 	mv .git here &&
 	ln -s here .git &&
-	git init -L ../realgitdir
+	git init --separate-git-dir ../realgitdir
 	) &&
 	echo "gitdir: `pwd`/realgitdir" >expected &&
 	test_cmp expected newdir/.git &&