git-annex/Assistant/Threads
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
..
Committer.hs addistant: honor annex.delayadd for non-large files 2021-07-13 12:17:00 -04:00
ConfigMonitor.hs add git ls-tree --long parser 2021-03-23 12:47:00 -04:00
Cronner.hs assistant: Avoid unncessary git repository repair 2021-06-30 18:00:16 -04:00
DaemonStatus.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Exporter.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Glacier.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Merger.hs remove direct mode remnant of merging unrelated histories 2021-07-19 11:41:26 -04:00
MountWatcher.hs finished this stage of the RawFilePath conversion 2020-11-04 14:20:37 -04:00
NetWatcher.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
PairListener.hs convert TopFilePath to use RawFilePath 2019-12-09 15:07:21 -04:00
ProblemFixer.hs assistant: Avoid unncessary git repository repair 2021-06-30 18:00:16 -04:00
Pusher.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
RemoteControl.hs convert to withCreateProcess for async exception safety 2020-06-04 12:44:09 -04:00
SanityChecker.hs switch from hslogger to purpose-built Utility.Debug 2021-04-05 13:40:31 -04:00
TransferPoller.hs convert getFileSize to RawFilePath 2020-11-05 11:32:57 -04:00
Transferrer.hs propagate git-annex -c on to transferrer child process 2020-12-15 11:36:25 -04:00
TransferScanner.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
TransferWatcher.hs finished this stage of the RawFilePath conversion 2020-11-04 14:20:37 -04:00
Upgrader.hs fix windows assistant upgrade glitch 2020-11-19 12:50:25 -04:00
UpgradeWatcher.hs finished this stage of the RawFilePath conversion 2020-11-04 14:20:37 -04:00
Watcher.hs addistant: honor annex.delayadd for non-large files 2021-07-13 12:17:00 -04:00
WebApp.hs switch from hslogger to purpose-built Utility.Debug 2021-04-05 13:40:31 -04:00