diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-06 19:00:01 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-06 19:00:01 -0400 |
| commit | 6be8289158fd30d972ac22766452e7c9dc809e6f (patch) | |
| tree | ba4929c7c8f27d2b43051f637394115cda39258b /Locations.hs | |
| parent | 6ea1214fa5d19241851a977ab82437563e2afc81 (diff) | |
| parent | 971ed2a464a1a1e4d5e650e32390d232cd354d9d (diff) | |
Merge branch 'master' into relativepaths
Conflicts:
Locations.hs
debian/changelog
Diffstat (limited to 'Locations.hs')
| -rw-r--r-- | Locations.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Locations.hs b/Locations.hs index 614cbdde3..02758eb05 100644 --- a/Locations.hs +++ b/Locations.hs @@ -146,7 +146,7 @@ gitAnnexLink file key r = do currdir <- getCurrentDirectory let absfile = fromMaybe whoops $ absNormPathUnix currdir file loc <- gitAnnexLocation' key r False - relPathDirToFile (parentDir absfile) loc + relPathDirToFile (takeDirectory absfile) loc where whoops = error $ "unable to normalize " ++ file |