summaryrefslogtreecommitdiff
path: root/Command.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2010-12-11 17:14:54 -0400
committerGravatar Joey Hess <joey@kitenet.net>2010-12-11 17:14:54 -0400
commit77e52a52dd2f77e5acc0643673169b4e1d2550f9 (patch)
treea03673642eca97780cdf88bc9b268994193b4f8c /Command.hs
parenteef009fa2a94fe8d2934d314898839f7a864c7ee (diff)
Bugfix to git annex add of an unlocked file in a subdir. Closes: #606579
Diffstat (limited to 'Command.hs')
-rw-r--r--Command.hs4
1 files changed, 3 insertions, 1 deletions
diff --git a/Command.hs b/Command.hs
index 4ba6ea4b3..69b9dee9f 100644
--- a/Command.hs
+++ b/Command.hs
@@ -151,7 +151,9 @@ withFilesUnlocked' typechanged a params = do
-- unlocked files have changed type from a symlink to a regular file
repo <- Annex.gitRepo
typechangedfiles <- liftIO $ mapM (typechanged repo) params
- unlockedfiles <- liftIO $ filterM notSymlink $ foldl (++) [] typechangedfiles
+ unlockedfiles <- liftIO $ filterM notSymlink $
+ map (\f -> Git.workTree repo ++ "/" ++ f) $
+ foldl (++) [] typechangedfiles
unlockedfiles' <- filterFiles unlockedfiles
backendPairs a unlockedfiles'
withKeys :: SubCmdSeekStrings