ensure that gitdir is absolute

calcGitLink turns out to need it to be absolute, and it normally is,
but not if it's read from a .git file in a submodule, or perhaps from
GIT_DIR.

I should look into dropping this invariant.

1 files changed, 5 insertions, 2 deletions

diff --git a/Git/CurrentRepo.hs b/Git/CurrentRepo.hs
index f82241ae2..908cc389e 100644
--- a/Git/CurrentRepo.hs
+++ b/Git/CurrentRepo.hs
@@ -51,8 +51,11 @@ get = do
 		configure (Just d) r = do
 			r' <- Git.Config.read r
 			-- Let GIT_DIR override the default gitdir.
-			return $ changelocation r' $
-				Local { gitdir = d, worktree = worktree (location r') }
+			absd <- absPath d
+			return $ changelocation r' $ Local
+				{ gitdir = absd
+				, worktree = worktree (location r')
+				}
 		addworktree w r = changelocation r $
 			Local { gitdir = gitdir (location r), worktree = w }
 		changelocation r l = r { location = l }