mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix build warnings

Browse source
This commit is contained in:
Joey Hess 2019-08-13 13:12:41 -04:00
parent cfd0b4108e
commit 3049271fd0
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Command/Merge.hs
View file

@ -27,7 +27,6 @@ seek [] = do
seek bs = do
prepMerge
forM_ bs (commandAction . mergeBranch . Git.Ref)
seek _ = giveup ""
mergeAnnexBranch :: CommandStart
mergeAnnexBranch = starting "merge" (ActionItemOther (Just "git-annex")) $ do
@ -42,5 +41,4 @@ mergeSyncedBranch = mergeLocal mergeConfig def =<< getCurrentBranch
mergeBranch :: Git.Ref -> CommandStart
mergeBranch r = starting "merge" (ActionItemOther (Just (Git.fromRef r))) $ do
currbranch <- getCurrentBranch
merge currbranch mergeConfig def Git.Branch.ManualCommit r
next $ return True
nest $ merge currbranch mergeConfig def Git.Branch.ManualCommit r