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
|
||||
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 ()
|
||||
|
|
Loading…
Reference in a new issue