diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2018-02-26 14:10:03 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2018-02-26 14:10:03 -0400 |
| commit | 4f274998c0c39102ea9dff6fa9bef3127478ca66 (patch) | |
| tree | 6833e3a01c4163704abd15cdbaa8e205e6a88a3d /Command | |
| parent | 27b7de929fbdd8bde934d098ea47c418f688c464 (diff) | |
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.
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/Sync.hs | 2 |
1 files changed, 1 insertions, 1 deletions
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 |