on master help sign in
Fix a patch for 7.4
commite68532a35ec119651a5c96e10d1f09a9c18dc740 authorMichael Snoyman <michael@snoyman.com> dateSun 6 Apr 2014, 18:49 (13 years ago) parent180dee2
1 file changed+9−6
patching/patches/gitlib-cmdline-3.0.1.patch+9−6
patching/patches/gitlib-cmdline-3.0.1.patch+9−6
@@ -1,14 +1,17 @@
11diff -ru orig/Git/CmdLine.hs new/Git/CmdLine.hs
2−--- orig/Git/CmdLine.hs 2014-04-06 09:02:46.027789820 +0300
3−+++ new/Git/CmdLine.hs 2014-04-06 09:02:45.000000000 +0300
4−@@ -23,6 +23,7 @@
2+--- orig/Git/CmdLine.hs 2014-04-06 18:49:23.851795879 +0300
3++++ new/Git/CmdLine.hs 2014-04-06 18:49:23.000000000 +0300
4+@@ -23,8 +23,9 @@
55 import Control.Monad.Reader.Class
66 import Control.Monad.Trans.Class
77 import Control.Monad.Trans.Reader (ReaderT, runReaderT)
88+import Control.Monad.Trans.Resource (MonadThrow (..))
99 import qualified Data.ByteString as B
10− import Data.Conduit hiding (MonadBaseControl)
10+-import Data.Conduit hiding (MonadBaseControl)
11++import Data.Conduit
1112 import qualified Data.Conduit.List as CL
13+ import Data.Foldable (for_)
14+ import Data.Function
1215@@ -88,7 +89,7 @@
1316 -- instance HasCliRepo (env, CliRepo) where
1417 -- getCliRepo = snd
@@ -28,8 +31,8 @@ diff -ru orig/Git/CmdLine.hs new/Git/CmdLine.hs
2831 mkOid :: MonadCli m => forall o. TL.Text -> ReaderT CliRepo m (Tagged o SHA)
2932 mkOid = fmap Tagged <$> textToSha . toStrict
3033diff -ru orig/gitlib-cmdline.cabal new/gitlib-cmdline.cabal
31−--- orig/gitlib-cmdline.cabal 2014-04-06 09:02:46.031789820 +0300
32−+++ new/gitlib-cmdline.cabal 2014-04-06 09:02:45.000000000 +0300
34+--- orig/gitlib-cmdline.cabal 2014-04-06 18:49:23.895795879 +0300
35++++ new/gitlib-cmdline.cabal 2014-04-06 18:49:23.000000000 +0300
3336@@ -39,6 +39,7 @@
3437 , transformers >= 0.2.2
3538 , transformers-base >= 0.4.1