set version before running operation that can commit
This commit is contained in:
parent
8ad3fd2657
commit
b7a49283fb
1 changed files with 2 additions and 1 deletions
|
@ -61,18 +61,19 @@ upgrade = do
|
||||||
if Git.repoIsLocalBare g
|
if Git.repoIsLocalBare g
|
||||||
then do
|
then do
|
||||||
moveContent
|
moveContent
|
||||||
|
setVersion
|
||||||
else do
|
else do
|
||||||
moveContent
|
moveContent
|
||||||
updateSymlinks
|
updateSymlinks
|
||||||
moveLocationLogs
|
moveLocationLogs
|
||||||
|
|
||||||
Annex.queueRun
|
Annex.queueRun
|
||||||
|
setVersion
|
||||||
|
|
||||||
-- add new line to auto-merge hashed location logs
|
-- add new line to auto-merge hashed location logs
|
||||||
-- this commits, so has to come after the upgrade
|
-- this commits, so has to come after the upgrade
|
||||||
liftIO $ Command.Init.gitAttributesWrite g
|
liftIO $ Command.Init.gitAttributesWrite g
|
||||||
|
|
||||||
setVersion
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
moveContent :: Annex ()
|
moveContent :: Annex ()
|
||||||
|
|
Loading…
Reference in a new issue