mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Bugfix to git annex add of an unlocked file in a subdir. Closes: #606579

Browse source
This commit is contained in:
Joey Hess 2010-12-11 17:14:54 -04:00
parent eef009fa2a
commit 77e52a52dd
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Command.hs
View file

@ -151,7 +151,9 @@ withFilesUnlocked' typechanged a params = do
-- unlocked files have changed type from a symlink to a regular file -- unlocked files have changed type from a symlink to a regular file
repo <- Annex.gitRepo repo <- Annex.gitRepo
typechangedfiles <- liftIO $ mapM (typechanged repo) params 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 unlockedfiles' <- filterFiles unlockedfiles
backendPairs a unlockedfiles' backendPairs a unlockedfiles'
withKeys :: SubCmdSeekStrings withKeys :: SubCmdSeekStrings

1
debian/changelog vendored
View file

@ -2,6 +2,7 @@ git-annex (0.12) UNRELEASED; urgency=low
* Add --exclude option to exclude files from processing. * Add --exclude option to exclude files from processing.
* mwdn2man: Fix a bug in newline supression. Closes: #606578 * 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 -- Joey Hess <joeyh@debian.org> Wed, 08 Dec 2010 14:06:47 -0400