From 425bc1107aebdb701cdcee44da731dd918cd470d Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Fri, 9 Jan 2015 13:11:56 -0400
Subject: revert parentDir change

Reverts 2bba5bc22d049272d3328bfa6c452d3e2e50e86c

Unfortunately, this caused breakage on Windows, and possibly elsewhere,
because parentDir and takeDirectory do not behave the same when there is a
trailing directory separator.
---
 Upgrade/V1.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Upgrade')

diff --git a/Upgrade/V1.hs b/Upgrade/V1.hs
index 7113509fe..347b102ac 100644
--- a/Upgrade/V1.hs
+++ b/Upgrade/V1.hs
@@ -73,7 +73,7 @@ moveContent = do
   where
 	move f = do
 		let k = fileKey1 (takeFileName f)
-		let d = takeDirectory f
+		let d = parentDir f
 		liftIO $ allowWrite d
 		liftIO $ allowWrite f
 		moveAnnex k f
@@ -114,7 +114,7 @@ moveLocationLogs = do
 		dest <- fromRepo $ logFile2 k
 		dir <- fromRepo Upgrade.V2.gitStateDir
 		let f = dir </> l
-		liftIO $ createDirectoryIfMissing True (takeDirectory dest)
+		liftIO $ createDirectoryIfMissing True (parentDir dest)
 		-- could just git mv, but this way deals with
 		-- log files that are not checked into git,
 		-- as well as merging with already upgraded
-- 
cgit v1.2.3