From 8ae0db925bcd1b11878b7c0b921e3acf775a03e7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 11 Mar 2019 13:56:59 -0400 Subject: [PATCH] fix name of annex-tracking-branch config --- Command/Sync.hs | 2 +- Types/GitConfig.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Command/Sync.hs b/Command/Sync.hs index 01a4e0e86f..99df64fbff 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -753,7 +753,7 @@ seekExportContent o rs (currbranch, _) = or <$> forM rs go ] _ -> noop where - gitconfig = show (remoteConfig r "annex-tracking-branch") + gitconfig = show (remoteConfig r "tracking-branch") fillexport _ _ [] _ = return False fillexport r db (t:[]) mtbcommitsha = Command.Export.fillExport r db t mtbcommitsha diff --git a/Types/GitConfig.hs b/Types/GitConfig.hs index f7500c8540..bce4e26d7c 100644 --- a/Types/GitConfig.hs +++ b/Types/GitConfig.hs @@ -288,7 +288,7 @@ extractRemoteGitConfig r remotename = do , remoteAnnexCheckUUID = getbool "checkuuid" True , remoteAnnexVerify = getbool "verify" True , remoteAnnexTrackingBranch = Git.Ref <$> - ( notempty (getmaybe "annex-tracking-branch") + ( notempty (getmaybe "tracking-branch") <|> notempty (getmaybe "export-tracking") -- old name ) , remoteAnnexTrustLevel = notempty $ getmaybe "trustlevel"