From b7a49283fb94a9fc1d5b4d66f0f992e329ef1ee7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 16 Mar 2011 16:07:33 -0400
Subject: [PATCH] set version before running operation that can commit

---
 Upgrade/V1.hs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Upgrade/V1.hs b/Upgrade/V1.hs
index f1c3e6143c..270de5f74b 100644
--- a/Upgrade/V1.hs
+++ b/Upgrade/V1.hs
@@ -61,18 +61,19 @@ upgrade = do
 	if Git.repoIsLocalBare g
 		then do
 			moveContent
+			setVersion
 		else do
 			moveContent
 			updateSymlinks
 			moveLocationLogs
 	
 			Annex.queueRun
+			setVersion
 
 			-- add new line to auto-merge hashed location logs
 			-- this commits, so has to come after the upgrade
 			liftIO $ Command.Init.gitAttributesWrite g
 
-	setVersion
 	return True
 
 moveContent :: Annex ()