When auto-upgrading a v3 remote, avoid upgrading to version 6, instead keep it at version 5.

Fixes a bug introduced with v6 mode that I didn't notice until now.
Probably not many v3 repos left out there, and upgrading them to v6 mode
is not disastrous, only a little premature.

This commit was sponsored by Riku Voipio
This commit is contained in:
Joey Hess 2016-10-05 16:23:09 -04:00
parent f23446b60e
commit f867fc157f
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
6 changed files with 14 additions and 11 deletions

View file

@ -93,7 +93,8 @@ initialize' mversion = do
Database.Keys.scanAssociatedFiles
v <- checkAdjustedClone
case v of
NeedUpgradeForAdjustedClone -> void $ upgrade True
NeedUpgradeForAdjustedClone ->
void $ upgrade True versionForAdjustedClone
InAdjustedClone -> return ()
NotInAdjustedClone ->
ifM (crippledFileSystem <&&> (not <$> isBareRepo))