diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-04-29 14:59:49 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-04-29 14:59:49 -0400 |
| commit | 36852d90bc18cb7b2bddb1ce9dce39cc1f0203de (patch) | |
| tree | 0419a1d67f6bb9db4ce79f8cb76b53752e2d7371 /Git/CurrentRepo.hs | |
| parent | efe7e174bfab4d0dd2e88e7b6eb859940b2228ea (diff) | |
| download | git-repair-36852d90bc18cb7b2bddb1ce9dce39cc1f0203de.tar.gz | |
Merge from git-annex.
Diffstat (limited to 'Git/CurrentRepo.hs')
| -rw-r--r-- | Git/CurrentRepo.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Git/CurrentRepo.hs b/Git/CurrentRepo.hs index f611f7a..dab4ad2 100644 --- a/Git/CurrentRepo.hs +++ b/Git/CurrentRepo.hs @@ -1,6 +1,6 @@ {- The current git repository. - - - Copyright 2012 Joey Hess <joey@kitenet.net> + - Copyright 2012 Joey Hess <id@joeyh.name> - - Licensed under the GNU GPL version 3 or higher. -} @@ -50,8 +50,8 @@ get = do configure (Just d) _ = do absd <- absPath d curr <- getCurrentDirectory - r <- newFrom $ Local { gitdir = absd, worktree = Just curr } - Git.Config.read r + Git.Config.read $ newFrom $ + Local { gitdir = absd, worktree = Just curr } configure Nothing Nothing = error "Not in a git repository." addworktree w r = changelocation r $ |