diff options
| -rw-r--r-- | Git/CurrentRepo.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Git/CurrentRepo.hs b/Git/CurrentRepo.hs index 908cc389e..29bb28177 100644 --- a/Git/CurrentRepo.hs +++ b/Git/CurrentRepo.hs @@ -30,7 +30,7 @@ import qualified Git.Config get :: IO Repo get = do gd <- pathenv "GIT_DIR" - r <- configure gd =<< maybe fromCwd fromPath gd + r <- configure gd =<< fromCwd wt <- maybe (worktree $ location r) Just <$> pathenv "GIT_WORK_TREE" case wt of Nothing -> return r diff --git a/debian/changelog b/debian/changelog index 0e01ba32d..e6e736c41 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git-annex (3.20121018) UNRELEASED; urgency=low + + * Fix handling of GIT_DIR when it refers to a git submodule. + + -- Joey Hess <joeyh@debian.org> Wed, 17 Oct 2012 14:24:10 -0400 + git-annex (3.20121017) unstable; urgency=low * Fix zombie cleanup reversion introduced in 3.20121009. |