summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2014-01-15 16:35:00 -0400
committerJoey Hess <joey@kitenet.net>2014-01-15 16:35:00 -0400
commit36c3e8be3aa98296eec964bba5abc96c40f41468 (patch)
tree5460eee813777d65affa4b66899e615166dd46e9
parent14ce1badd4210ebb2660e0fb22ba4ff7f2986dee (diff)
downloadgit-repair-36c3e8be3aa98296eec964bba5abc96c40f41468.tar.gz
repair: Fix bug in packed refs file exploding code that caused a .gitrefs directory to be created instead of .git/refs
-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 3ae9c9f..2c09836 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 a34dc98..a272670 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ git-repair (1.20131214) UNRELEASED; urgency=medium
* Support old git versions from before git fsck --no-dangling was
implemented.
+ * 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> Mon, 13 Jan 2014 18:07:13 -0400