mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Fix initialization of a bare clone of a repo that has an adjusted branch checked out.

Browse source
This commit is contained in:
Joey Hess 2016-06-02 17:02:38 -04:00
parent 26887745a0
commit 907fc62f2c
Failed to extract signature
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Annex/AdjustedBranch.hs
View file

@ -52,6 +52,7 @@ import Annex.Perms
import Annex.GitOverlay import Annex.GitOverlay
import Utility.Tmp import Utility.Tmp
import qualified Database.Keys import qualified Database.Keys
import Config
import qualified Data.Map as M import qualified Data.Map as M
@ -551,7 +552,10 @@ data AdjustedClone = InAdjustedClone | NotInAdjustedClone | NeedUpgradeForAdjust
- current version is too old to support adjusted branches. Returns True - current version is too old to support adjusted branches. Returns True
- when this is the case. -} - when this is the case. -}
checkAdjustedClone :: Annex AdjustedClone checkAdjustedClone :: Annex AdjustedClone
checkAdjustedClone = go =<< inRepo Git.Branch.current checkAdjustedClone = ifM isBareRepo
( return NotInAdjustedClone
, go =<< inRepo Git.Branch.current
)
where where
go Nothing = return NotInAdjustedClone go Nothing = return NotInAdjustedClone
go (Just currbranch) = case adjustedToOriginal currbranch of go (Just currbranch) = case adjustedToOriginal currbranch of

2
CHANGELOG
View file

@ -13,6 +13,8 @@ git-annex (6.20160528) UNRELEASED; urgency=medium
when used with git 2.9, which has stopped doing this itself. when used with git 2.9, which has stopped doing this itself.
* Automatically enable v6 mode when initializing in a clone from a repo * Automatically enable v6 mode when initializing in a clone from a repo
that has an adjusted branch checked out. that has an adjusted branch checked out.
* Fix initialization of a bare clone of a repo that has an adjusted
branch checked out.
* remotedaemon: Fixed support for notifications of changes to gcrypt * remotedaemon: Fixed support for notifications of changes to gcrypt
remotes, which was never tested and didn't quite work before. remotes, which was never tested and didn't quite work before.