diff options
Diffstat (limited to 'Git/Queue.hs')
-rw-r--r-- | Git/Queue.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Git/Queue.hs b/Git/Queue.hs index ee1f83ca9..80d953803 100644 --- a/Git/Queue.hs +++ b/Git/Queue.hs @@ -1,6 +1,7 @@ {- git repository command queue - - Copyright 2010,2012 Joey Hess <id@joeyh.name> + - Copyright 2022 Benjamin Barenblat <bbarenblat@gmail.com> - - Licensed under the GNU GPL version 3 or higher. -} @@ -24,7 +25,7 @@ import Git import Git.Command import qualified Git.UpdateIndex -import qualified Data.Map as M +import qualified Data.Map.Strict as M {- Queable actions that can be performed in a git repository. -} data Action @@ -117,7 +118,7 @@ updateQueue !action different sizeincrease q repo , items = newitems } !newsize = size q' + sizeincrease - !newitems = M.insertWith' combineNewOld (actionKey action) action (items q') + !newitems = M.insertWith combineNewOld (actionKey action) action (items q') combineNewOld :: Action -> Action -> Action combineNewOld (CommandAction _sc1 _ps1 fs1) (CommandAction sc2 ps2 fs2) = |