diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-04-06 18:40:28 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-04-06 18:40:28 -0400 |
| commit | 9de9f5aad4ec0275e3c544fcb26588ea0e755760 (patch) | |
| tree | 492124ae7448a3e287b0c1f4af855aec727c736b /Command/Sync.hs | |
| parent | 070b1a03392ab3962eb43f60f32fde5c1b9b70d2 (diff) | |
run out of tree merge with --no-ff
This is how direct mode does it too, and somehow, for reasons that
currently escape me, this makes git merge not care if it's run with an
empty work tree.
Diffstat (limited to 'Command/Sync.hs')
| -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 9ef26f19e..69f39bb8a 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -170,7 +170,7 @@ merge :: CurrBranch -> Git.Branch.CommitMode -> Git.Branch -> Annex Bool merge (Just b, Just adj) commitmode tomerge = updateAdjustedBranch tomerge (b, adj) commitmode merge (b, _) commitmode tomerge = - autoMergeFrom tomerge b False commitmode + autoMergeFrom tomerge b commitmode syncBranch :: Git.Branch -> Git.Branch syncBranch = Git.Ref.under "refs/heads/synced" . fromDirectBranch . fromAdjustedBranch |