aboutsummaryrefslogtreecommitdiff
path: root/Git
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-01-05 17:22:19 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-01-05 17:22:19 -0400
commit903241502a6ad1a4845ac2d131ef7fc2b547400d (patch)
treefba85c9751a19aa0873e0f2bd837a1b000588508 /Git
parentcf911557bf4bb27768c4fc5ac482e8f827807497 (diff)
use TopFilePath for associated files
Fixes several bugs with updates of pointer files. When eg, running git annex drop --from localremote it was updating the pointer file in the local repository, not the remote. Also, fixes drop ../foo when run in a subdir, and probably lots of other problems. Test suite drops from ~30 to 11 failures now. TopFilePath is used to force thinking about what the filepath is relative to. The data stored in the sqlite db is still just a plain string, and TopFilePath is a newtype, so there's no overhead involved in using it in DataBase.Keys.
Diffstat (limited to 'Git')
-rw-r--r--Git/FilePath.hs3
1 files changed, 1 insertions, 2 deletions
diff --git a/Git/FilePath.hs b/Git/FilePath.hs
index edc3c0f90..7e7d86bb4 100644
--- a/Git/FilePath.hs
+++ b/Git/FilePath.hs
@@ -13,9 +13,8 @@
{-# LANGUAGE CPP #-}
module Git.FilePath (
- TopFilePath,
+ TopFilePath(..),
fromTopFilePath,
- getTopFilePath,
toTopFilePath,
asTopFilePath,
InternalGitPath,