diff options
| author | Joey Hess <joeyh@joeyh.name> | 2023-08-14 12:06:32 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2023-08-14 12:12:52 -0400 |
| commit | edf83982be214f3c839fab9b659f645de53a9100 (patch) | |
| tree | bef06cb750379c6d7942fc13b13fcb328201354c /Git/CurrentRepo.hs | |
| parent | f0cd3a2a3758ddcd2f0900c16bdc1fb80bbd6e92 (diff) | |
| download | git-repair-edf83982be214f3c839fab9b659f645de53a9100.tar.gz | |
merge from git-annex
Support building with unix-compat 0.7
Diffstat (limited to 'Git/CurrentRepo.hs')
| -rw-r--r-- | Git/CurrentRepo.hs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Git/CurrentRepo.hs b/Git/CurrentRepo.hs index 9261eab..54e05f4 100644 --- a/Git/CurrentRepo.hs +++ b/Git/CurrentRepo.hs @@ -1,6 +1,6 @@ {- The current git repository. - - - Copyright 2012-2020 Joey Hess <id@joeyh.name> + - Copyright 2012-2022 Joey Hess <id@joeyh.name> - - Licensed under the GNU AGPL version 3 or higher. -} @@ -79,8 +79,9 @@ get = do { gitdir = absd , worktree = Just curr } - r <- Git.Config.read $ newFrom loc - return $ if Git.Config.isBare r + r <- Git.Config.read $ (newFrom loc) + { gitDirSpecifiedExplicitly = True } + return $ if fromMaybe False (Git.Config.isBare r) then r { location = (location r) { worktree = Nothing } } else r configure Nothing Nothing = giveup "Not in a git repository." |