fix build warnings
This commit is contained in:
parent
cfd0b4108e
commit
3049271fd0
1 changed files with 1 additions and 3 deletions
|
@ -27,7 +27,6 @@ seek [] = do
|
||||||
seek bs = do
|
seek bs = do
|
||||||
prepMerge
|
prepMerge
|
||||||
forM_ bs (commandAction . mergeBranch . Git.Ref)
|
forM_ bs (commandAction . mergeBranch . Git.Ref)
|
||||||
seek _ = giveup ""
|
|
||||||
|
|
||||||
mergeAnnexBranch :: CommandStart
|
mergeAnnexBranch :: CommandStart
|
||||||
mergeAnnexBranch = starting "merge" (ActionItemOther (Just "git-annex")) $ do
|
mergeAnnexBranch = starting "merge" (ActionItemOther (Just "git-annex")) $ do
|
||||||
|
@ -42,5 +41,4 @@ mergeSyncedBranch = mergeLocal mergeConfig def =<< getCurrentBranch
|
||||||
mergeBranch :: Git.Ref -> CommandStart
|
mergeBranch :: Git.Ref -> CommandStart
|
||||||
mergeBranch r = starting "merge" (ActionItemOther (Just (Git.fromRef r))) $ do
|
mergeBranch r = starting "merge" (ActionItemOther (Just (Git.fromRef r))) $ do
|
||||||
currbranch <- getCurrentBranch
|
currbranch <- getCurrentBranch
|
||||||
merge currbranch mergeConfig def Git.Branch.ManualCommit r
|
nest $ merge currbranch mergeConfig def Git.Branch.ManualCommit r
|
||||||
next $ return True
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue