From 4f274998c0c39102ea9dff6fa9bef3127478ca66 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 26 Feb 2018 14:10:03 -0400 Subject: fix sync bug in direct mode sync: Fix bug that prevented pulling changes into direct mode repositories that were committed to remotes using git commit rather than git-annex sync. This commit was supported by the NSF-funded DataLad project. --- Command/Sync.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Command') diff --git a/Command/Sync.hs b/Command/Sync.hs index 75752f4ff..c2f0eebe7 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -434,7 +434,7 @@ mergeRemote remote currbranch mergeconfig resolvemergeoverride = ifM isBareRepo (mapM (merge currbranch mergeconfig resolvemergeoverride Git.Branch.ManualCommit . remoteBranch remote) =<< getlist) tomerge = filterM (changed remote) branchlist Nothing = [] - branchlist (Just branch) = [branch, syncBranch branch] + branchlist (Just branch) = [fromDirectBranch (fromAdjustedBranch branch), syncBranch branch] pushRemote :: SyncOptions -> Remote -> CurrBranch -> CommandStart pushRemote _o _remote (Nothing, _) = stop -- cgit v1.2.3