diff options
author | Joey Hess <joeyh@joeyh.name> | 2016-11-15 18:26:17 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2016-11-15 18:26:17 -0400 |
commit | 89e19686ec88d68355ce756ead1245e9bf1bd44e (patch) | |
tree | ce68ea6a7e779dd477294ecdcc813ac0663fc9ba /Assistant/Threads | |
parent | d943787ca787d32071643d5b94efa312fafe6ba8 (diff) |
sync: Pass --allow-unrelated-histories to git merge when used with git git 2.9.0 or newer.
This makes merging a remote into a freshly created direct mode repository
work the same as it works in indirect mode.
The git-annex branches would get merged in any case by a sync,
since that doesn't use git merge.
This might need to be revisited later to better mirror git's behavior.
Diffstat (limited to 'Assistant/Threads')
-rw-r--r-- | Assistant/Threads/Merger.hs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Assistant/Threads/Merger.hs b/Assistant/Threads/Merger.hs index 521e5bda6..ce0dfbcb4 100644 --- a/Assistant/Threads/Merger.hs +++ b/Assistant/Threads/Merger.hs @@ -12,7 +12,6 @@ import Assistant.TransferQueue import Assistant.BranchChange import Assistant.DaemonStatus import Assistant.ScanRemotes -import Assistant.Sync import Utility.DirWatcher import Utility.DirWatcher.Types import qualified Annex.Branch @@ -86,7 +85,7 @@ onChange file , "into", Git.fromRef b ] void $ liftAnnex $ Command.Sync.merge - currbranch mergeConfig + currbranch Command.Sync.mergeConfig Git.Branch.AutomaticCommit changedbranch mergecurrent _ = noop |