aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Git/Repair.hs2
-rw-r--r--debian/changelog2
2 files changed, 3 insertions, 1 deletions
diff --git a/Git/Repair.hs b/Git/Repair.hs
index 3ae9c9faa..2c0983609 100644
--- a/Git/Repair.hs
+++ b/Git/Repair.hs
@@ -231,7 +231,7 @@ explodePackedRefsFile r = do
nukeFile f
where
makeref (sha, ref) = do
- let dest = localGitDir r ++ show ref
+ let dest = localGitDir r </> show ref
createDirectoryIfMissing True (parentDir dest)
unlessM (doesFileExist dest) $
writeFile dest (show sha)
diff --git a/debian/changelog b/debian/changelog
index 14f1b183c..51c8eb2c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ git-annex (5.20140108) UNRELEASED; urgency=medium
recover.
* Fix FTBFS on mipsel and sparc due to test suite not being available
on those architectures.
+ * repair: Fix bug in packed refs file exploding code that caused a .gitrefs
+ directory to be created instead of .git/refs
-- Joey Hess <joeyh@debian.org> Wed, 08 Jan 2014 13:13:54 -0400