diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-16 00:02:14 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-16 00:08:39 -0400 |
| commit | 7129c1f89e5ff5e5334bb98cab81988c065d4ec2 (patch) | |
| tree | 9168a5f55e8d120fb937b11aee08e52d457e9c3a /Git/CurrentRepo.hs | |
| parent | 5fb6e3b804dccf5b727100eb139e289ad6bc0770 (diff) | |
A relative core.worktree is relative to the gitdir.
Now that this is handled correctly, git-annex can be used in git submodules.
Also, fixed infelicity where Git.CurrentRepo and Git.Config.updateLocation
were both dealing with core.worktree. Now updateLocation handles it for
Local as well as for LocalUnknown repos.
Diffstat (limited to 'Git/CurrentRepo.hs')
| -rw-r--r-- | Git/CurrentRepo.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Git/CurrentRepo.hs b/Git/CurrentRepo.hs index 861df1b64..f82241ae2 100644 --- a/Git/CurrentRepo.hs +++ b/Git/CurrentRepo.hs @@ -31,7 +31,7 @@ get :: IO Repo get = do gd <- pathenv "GIT_DIR" r <- configure gd =<< maybe fromCwd fromPath gd - wt <- maybe (Git.Config.workTree r) Just <$> pathenv "GIT_WORK_TREE" + wt <- maybe (worktree $ location r) Just <$> pathenv "GIT_WORK_TREE" case wt of Nothing -> return r Just d -> do |