mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
git-annex/Assistant
History
Joey Hess b6bea0d3f2
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
2021-07-19 11:41:26 -04:00
..
Alert update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Install hush build warning on OSX 2020-11-13 13:34:34 -04:00
Pairing comment typo 2021-04-08 13:08:01 -04:00
Threads remove direct mode remnant of merging unrelated histories 2021-07-19 11:41:26 -04:00
Types start splitting out readonly values from AnnexState 2021-04-02 15:51:44 -04:00
WebApp remove webapp debug check box 2021-04-06 17:23:12 -04:00
Alert.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
BranchChange.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Changes.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Commits.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Common.hs use fastDebug everywhere it can be used 2021-04-06 15:41:24 -04:00
CredPairCache.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
DaemonStatus.hs switch from hslogger to purpose-built Utility.Debug 2021-04-05 13:40:31 -04:00
DeleteRemote.hs auto-init autoenable=yes 2020-05-27 12:40:35 -04:00
Drop.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Fsck.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Gpg.hs be stricter about rejecting invalid configurations for remotes 2020-01-10 14:52:48 -04:00
Install.hs finished this stage of the RawFilePath conversion 2020-11-06 14:10:58 -04:00
MakeRemote.hs auto-init autoenable=yes 2020-05-27 12:40:35 -04:00
MakeRepo.hs sync --quiet 2021-07-19 11:28:47 -04:00
Monad.hs use fastDebug everywhere it can be used 2021-04-06 15:41:24 -04:00
NamedThread.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Pairing.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Pushes.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
RemoteControl.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Repair.hs switch from hslogger to purpose-built Utility.Debug 2021-04-05 13:40:31 -04:00
RepoProblem.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Restart.hs finished this stage of the RawFilePath conversion 2020-11-04 14:20:37 -04:00
ScanRemotes.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Ssh.hs more RawFilePath conversion 2020-11-05 18:45:37 -04:00
Sync.hs remove direct mode remnant of merging unrelated histories 2021-07-19 11:41:26 -04:00
TransferQueue.hs cache the serialization of a Key 2019-11-22 17:49:16 -04:00
TransferSlots.hs start splitting out readonly values from AnnexState 2021-04-02 15:51:44 -04:00
Unused.hs avoid failure to lock content of removed file causing drop etc to fail 2020-07-25 11:59:33 -04:00
Upgrade.hs finish fixing removeLink on windows 2020-11-24 13:20:44 -04:00
WebApp.hs