diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-01-15 16:34:18 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-01-15 16:34:18 -0400 |
| commit | a8d07025dd7477ffc9860d79a4dbc3345cc4cf9c (patch) | |
| tree | affd6e04b05e8612f22b03dcecaf6313a22d42b4 | |
| parent | bfd6a508216bf0ef7ab75ea230f98487e71cc156 (diff) | |
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.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 |
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 |