From 6b3d7e6ef94a2b81cdf814aaf409acf4da7b0ac7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 16 Oct 2013 14:57:58 -0400
Subject: ensure merge directory is empty before starting merge

Don't want some past failed merge to lead to bad results, potentially.
---
 Annex/Direct.hs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Annex/Direct.hs')

diff --git a/Annex/Direct.hs b/Annex/Direct.hs
index ad9338ec7..96d3cdcc0 100644
--- a/Annex/Direct.hs
+++ b/Annex/Direct.hs
@@ -122,6 +122,8 @@ addDirect file cache = do
  -}
 mergeDirect :: FilePath -> Git.Ref -> Git.Repo -> IO Bool
 mergeDirect d branch g = do
+	whenM (doesDirectoryExist d) $
+		removeDirectoryRecursive d
 	createDirectoryIfMissing True d
 	let g' = g { location = Local { gitdir = Git.localGitDir g, worktree = Just d } }
 	Git.Merge.mergeNonInteractive branch g'
-- 
cgit v1.2.3