diff options
| -rw-r--r-- | Seek.hs | 8 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | doc/bugs/git_annex_add_..._adds_too_much.mdwn | 2 |
3 files changed, 13 insertions, 3 deletions
@@ -29,12 +29,14 @@ withFilesInGit a params = prepFiltered a $ seekHelper LsFiles.inRepo params withFilesNotInGit :: (FilePath -> CommandStart) -> CommandSeek withFilesNotInGit a params = do {- dotfiles are not acted on unless explicitly listed -} - files <- filter (not . dotfile) <$> seek ps - dotfiles <- if null dotps then return [] else seek dotps + files <- filter (not . dotfile) <$> + seekunless (null ps && not (null params)) ps + dotfiles <- seekunless (null dotps) dotps prepFiltered a $ return $ preserveOrder params (files++dotfiles) where (dotps, ps) = partition dotfile params - seek l = do + seekunless True _ = return [] + seekunless _ l = do force <- Annex.getState Annex.force g <- gitRepo liftIO $ (\p -> LsFiles.notInRepo force p g) l diff --git a/debian/changelog b/debian/changelog index 3266d85c0..2372820cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git-annex (3.20120407) UNRELEASED; urgency=low + + * bugfix: Adding a dotfile also caused all non-dotfiles to be added. + + -- Joey Hess <joeyh@debian.org> Sun, 08 Apr 2012 12:23:42 -0400 + git-annex (3.20120406) unstable; urgency=low * Disable diskfree on kfreebsd, as I have a build failure on kfreebsd-i386 diff --git a/doc/bugs/git_annex_add_..._adds_too_much.mdwn b/doc/bugs/git_annex_add_..._adds_too_much.mdwn index 5ef9bc577..4eb46455f 100644 --- a/doc/bugs/git_annex_add_..._adds_too_much.mdwn +++ b/doc/bugs/git_annex_add_..._adds_too_much.mdwn @@ -21,3 +21,5 @@ What version of git-annex are you using? On what operating system? 3.20120406 (same problem with version 3.20120123) on Debian. + +> Thanks for reporting this bug, I've fixed it in git. [[done]] --[[Joey]] |