remove direct mode remnant of merging unrelated histories

sync, merge, post-receive: Avoid merging unrelated histories, which used to
be allowed only to support direct mode repositories.

(However, sync does still merge unrelated histories when importing trees
from special remotes, and the assistant still merges unrelated histories
always.)

See 556b2ded2b for why this was added
back in 2016, for direct mode.

This is a behavior change, which might break something that was relying
on sync merging unrelated histories, but git had a good reason to
prevent it, since it's easy to foot shoot with it, and git-annex should
follow suit.

Sponsored-by: Noam Kremen on Patreon
This commit is contained in:
Joey Hess 2021-07-19 11:40:48 -04:00
parent 33a80d083a
commit b6bea0d3f2
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
6 changed files with 31 additions and 21 deletions

View file

@ -213,7 +213,8 @@ syncAction rs a
manualPull :: Command.Sync.CurrBranch -> [Remote] -> Assistant ([Remote], Bool)
manualPull currentbranch remotes = do
g <- liftAnnex gitRepo
mc <- liftAnnex Command.Sync.mergeConfig
-- Allow merging unrelated histories.
mc <- liftAnnex $ Command.Sync.mergeConfig True
failed <- forM remotes $ \r -> if wantpull $ Remote.gitconfig r
then do
g' <- liftAnnex $ do