From 06c58922bdb26da34a4070c84968407350f1e3c9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 22 Jun 2011 16:00:32 -0400
Subject: stop changing gitattributes on update from v1

gitattributes changes are not needed, and will be removed in the v2 upgrade
---
 Upgrade/V1.hs | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'Upgrade')

diff --git a/Upgrade/V1.hs b/Upgrade/V1.hs
index c09bd74c1..b139e2820 100644
--- a/Upgrade/V1.hs
+++ b/Upgrade/V1.hs
@@ -30,7 +30,6 @@ import Backend
 import Messages
 import Version
 import Utility
-import qualified Command.Init
 
 -- v2 adds hashing of filenames of content and location log files.
 -- Key information is encoded in filenames differently, so
@@ -72,10 +71,6 @@ upgrade = do
 			AnnexQueue.flush True
 			setVersion
 
-			-- add new line to auto-merge hashed location logs
-			-- this commits, so has to come after the upgrade
-			liftIO $ Command.Init.gitAttributesWrite g
-
 	return True
 
 moveContent :: Annex ()
-- 
cgit v1.2.3