diff options
| author |  Joey Hess <joey@kitenet.net> | 2010-12-11 17:14:54 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-12-11 17:14:54 -0400 |
| commit | 77e52a52dd2f77e5acc0643673169b4e1d2550f9 (patch) | |
| tree | a03673642eca97780cdf88bc9b268994193b4f8c | |
| parent | eef009fa2a94fe8d2934d314898839f7a864c7ee (diff) | |
Bugfix to git annex add of an unlocked file in a subdir. Closes: #606579
| -rw-r--r-- | Command.hs | 4 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 4 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 diff --git a/debian/changelog b/debian/changelog index 323cd2e75..6bc3c788a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ git-annex (0.12) UNRELEASED; urgency=low * Add --exclude option to exclude files from processing. * mwdn2man: Fix a bug in newline supression. Closes: #606578 + * Bugfix to git annex add of an unlocked file in a subdir. Closes: #606579 -- Joey Hess <joeyh@debian.org> Wed, 08 Dec 2010 14:06:47 -0400 |