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

fix name of annex-tracking-branch config

Browse source
This commit is contained in:
Joey Hess 2019-03-11 13:56:59 -04:00
parent e1fdc8b374
commit 8ae0db925b
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Command/Sync.hs
View file

@ -753,7 +753,7 @@ seekExportContent o rs (currbranch, _) = or <$> forM rs go
] ]
_ -> noop _ -> noop
where where
gitconfig = show (remoteConfig r "annex-tracking-branch") gitconfig = show (remoteConfig r "tracking-branch")
fillexport _ _ [] _ = return False fillexport _ _ [] _ = return False
fillexport r db (t:[]) mtbcommitsha = Command.Export.fillExport r db t mtbcommitsha fillexport r db (t:[]) mtbcommitsha = Command.Export.fillExport r db t mtbcommitsha

2
Types/GitConfig.hs
View file

@ -288,7 +288,7 @@ extractRemoteGitConfig r remotename = do
, remoteAnnexCheckUUID = getbool "checkuuid" True , remoteAnnexCheckUUID = getbool "checkuuid" True
, remoteAnnexVerify = getbool "verify" True , remoteAnnexVerify = getbool "verify" True
, remoteAnnexTrackingBranch = Git.Ref <$> , remoteAnnexTrackingBranch = Git.Ref <$>
( notempty (getmaybe "annex-tracking-branch") ( notempty (getmaybe "tracking-branch")
<|> notempty (getmaybe "export-tracking") -- old name <|> notempty (getmaybe "export-tracking") -- old name
) )
, remoteAnnexTrustLevel = notempty $ getmaybe "trustlevel" , remoteAnnexTrustLevel = notempty $ getmaybe "trustlevel"