diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-06-22 16:00:32 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-06-22 16:00:32 -0400 |
| commit | 06c58922bdb26da34a4070c84968407350f1e3c9 (patch) | |
| tree | 86dce708a971d75732ecf68158740c9ebd1af709 /Upgrade | |
| parent | 17a09fccad3cf2f958967081326b61c403b995cd (diff) | |
stop changing gitattributes on update from v1
gitattributes changes are not needed, and will be removed in the v2 upgrade
Diffstat (limited to 'Upgrade')
| -rw-r--r-- | Upgrade/V1.hs | 5 |
1 files changed, 0 insertions, 5 deletions
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 () |