From 3049271fd0db5e971004971d7aca6d4ff4c78377 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 13 Aug 2019 13:12:41 -0400 Subject: [PATCH] fix build warnings --- Command/Merge.hs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Command/Merge.hs b/Command/Merge.hs index ddeef3c688..b546f91e27 100644 --- a/Command/Merge.hs +++ b/Command/Merge.hs @@ -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