diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-12-14 15:30:14 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-12-14 15:43:13 -0400 |
| commit | 02f1bd2bf47d3ff49a222e9428ec27708ef55f64 (patch) | |
| tree | 456548530c65850a829a1a85609070bc111de1b9 /Git/Branch.hs | |
| parent | 2b24e16a633575703a43e1fb991f34b290a1d7e4 (diff) | |
split more stuff out of Git.hs
Diffstat (limited to 'Git/Branch.hs')
| -rw-r--r-- | Git/Branch.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Git/Branch.hs b/Git/Branch.hs index 8b0d1e5af..3e08e19c2 100644 --- a/Git/Branch.hs +++ b/Git/Branch.hs @@ -11,6 +11,7 @@ import qualified Data.ByteString.Lazy.Char8 as L import Common import Git +import Git.Sha {- Checks if the second branch has any commits not present on the first - branch. -} @@ -19,7 +20,7 @@ changed origbranch newbranch repo | origbranch == newbranch = return False | otherwise = not . L.null <$> diffs where - diffs = Git.pipeRead + diffs = pipeRead [ Param "log" , Param (show origbranch ++ ".." ++ show newbranch) , Params "--oneline -n1" @@ -44,7 +45,7 @@ fastForward branch (first:rest) repo = do where no_ff = return False do_ff to = do - Git.run "update-ref" + run "update-ref" [Param $ show branch, Param $ show to] repo return True findbest c [] = return $ Just c |