diff options
| -rw-r--r-- | Git/Queue.hs | 8 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Git/Queue.hs b/Git/Queue.hs index 2ec3a2b1e..9b87a18ea 100644 --- a/Git/Queue.hs +++ b/Git/Queue.hs @@ -82,16 +82,16 @@ new lim = Queue 0 (fromMaybe defaultLimit lim) M.empty -} addCommand :: String -> [CommandParam] -> [FilePath] -> Queue -> Repo -> IO Queue addCommand subcommand params files q repo = - updateQueue action different (length newfiles) q repo + updateQueue action different (length files) q repo where key = actionKey action action = CommandAction { getSubcommand = subcommand , getParams = params - , getFiles = newfiles + , getFiles = allfiles } - newfiles = map File files ++ maybe [] getFiles (M.lookup key $ items q) - + allfiles = map File files ++ maybe [] getFiles (M.lookup key $ items q) + different (CommandAction { getSubcommand = s }) = s /= subcommand different _ = True diff --git a/debian/changelog b/debian/changelog index 999270db8..48f795954 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ git-annex (5.20140614) UNRELEASED; urgency=medium * Windows: Fix opening file browser from webapp when repo is in a directory with spaces. * Windows: Assistant now logs to daemon.log. + * Fix bug in annex.queuesize calculation that caused much more + queue flushing than necessary. -- Joey Hess <joeyh@debian.org> Mon, 16 Jun 2014 11:28:42 -0400 |