diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-03-16 16:07:33 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-03-16 16:07:33 -0400 |
| commit | b7a49283fb94a9fc1d5b4d66f0f992e329ef1ee7 (patch) | |
| tree | 4ef8a302426009f38926dcf5a2acdd5e71743612 | |
| parent | 8ad3fd26570e8d6a8066f35353b535e4af81b7ff (diff) | |
set version before running operation that can commit
| -rw-r--r-- | Upgrade/V1.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Upgrade/V1.hs b/Upgrade/V1.hs index f1c3e6143..270de5f74 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 () |