From abdacf58ed5d0da0439819feb669b04b2368bb92 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 10 Jan 2012 15:36:54 -0400
Subject: tweaks

---
 git-union-merge.hs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'git-union-merge.hs')

diff --git a/git-union-merge.hs b/git-union-merge.hs
index 6fd19c8da..e439c4665 100644
--- a/git-union-merge.hs
+++ b/git-union-merge.hs
@@ -28,9 +28,7 @@ setup :: Git.Repo -> IO ()
 setup = cleanup -- idempotency
 
 cleanup :: Git.Repo -> IO ()
-cleanup g = do
-	e' <- doesFileExist (tmpIndex g)
-	when e' $ removeFile (tmpIndex g)
+cleanup g = whenM (doesFileExist $ tmpIndex g) $ removeFile $ tmpIndex g
 
 parseArgs :: IO [String]
 parseArgs = do
@@ -43,7 +41,7 @@ main :: IO ()
 main = do
 	[aref, bref, newref] <- map Git.Ref <$> parseArgs
 	g <- Git.Config.read =<< Git.Construct.fromCwd
-	_ <- Git.Index.override (tmpIndex g)
+	_ <- Git.Index.override $ tmpIndex g
 	setup g
 	Git.UnionMerge.merge aref bref g
 	_ <- Git.Branch.commit "union merge" newref [aref, bref] g
-- 
cgit v1.2.3