From bc93ceb7c5ec959ad275f575a3c49ff491337a8b Mon Sep 17 00:00:00 2001 From: Barry Wardell Date: Mon, 21 Jan 2013 01:22:02 +0000 Subject: git-svn: Simplify calculation of GIT_DIR Since git-rev-parse already checks for the $GIT_DIR environment variable and that it returns an actual git repository, there is no need to repeat the checks again here. This also fixes a problem where git-svn did not work in cases where .git was a file with a gitdir: link. [ew: squashed test case, delay setting GIT_DIR until after `git rev-parse --cdup` to fix t9101, (thanks to Junio)] Signed-off-by: Barry Wardell Signed-off-by: Eric Wong --- t/t9100-git-svn-basic.sh | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 't/t9100-git-svn-basic.sh') diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh index 749b75e8d4..4fea8d901b 100755 --- a/t/t9100-git-svn-basic.sh +++ b/t/t9100-git-svn-basic.sh @@ -306,5 +306,13 @@ test_expect_success 'git-svn works in a bare repository' ' git svn fetch ) && rm -rf bare-repo ' +test_expect_success 'git-svn works in in a repository with a gitdir: link' ' + mkdir worktree gitdir && + ( cd worktree && + git svn init "$svnrepo" && + git init --separate-git-dir ../gitdir && + git svn fetch ) && + rm -rf worktree gitdir + ' test_done -- cgit v1.2.1