mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
git-annex/Command
History
Joey Hess 1503b86a14
make import tree from remote generate a merge commit 
This way no history is lost, neither what was exported to the remote,
or the history of changes that is imported from it. No complicated
correlation of two possibly very different histories is needed, just
record what we know and then git merge will do a good job.

Also, it notices when the remote tracking branch doesn't need to be updated,
and avoids doing anything, so noop remotes are super cheap.

The only catch here is that, since the commits generated for imports
from the remote don't have a stable date or author/committer, each
(non-noop) import generates different commits for the same imported
trees. So, when the imported remote tracking branch is merged into master
and then a change is imported again, there will be an extra series of
commits, which will get more and more expensive each time.

This seems to call for making stable commits for imports. Also that
seems a good idea to make importing in several repositories have the
same result.
2019-04-30 16:13:21 -04:00
..
Add.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
AddUnused.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
AddUrl.hs addurl --file: Fix a bug that made youtube-dl be used unneccessarily when adding an html url that does not contain any media. 2019-03-18 13:34:29 -04:00
Adjust.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Assistant.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Benchmark.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
CalcKey.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
CheckPresentKey.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Commit.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Config.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
ConfigList.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
ContentLocation.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Copy.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Dead.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Describe.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
DiffDriver.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Direct.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Drop.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
DropKey.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
DropUnused.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
EnableRemote.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
EnableTor.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
ExamineKey.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Expire.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Export.hs improve messages around export/import conflicts 2019-04-09 13:03:59 -04:00
Find.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
FindRef.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Fix.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Forget.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
FromKey.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Fsck.hs fsck: Detect situations where annex.thin has caused data loss to the content of locked files. 2019-03-18 15:59:43 -04:00
FuzzTest.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
GCryptSetup.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Get.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Group.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
GroupWanted.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Help.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Import.hs make import tree from remote generate a merge commit 2019-04-30 16:13:21 -04:00
ImportFeed.hs distinguish between feed download and parse failures 2019-04-21 10:35:08 -04:00
InAnnex.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Indirect.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Info.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Init.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
InitRemote.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Inprogress.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
List.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Lock.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
LockContent.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Log.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
LookupKey.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Map.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
MatchExpression.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Merge.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
MetaData.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Migrate.hs fsck: Detect situations where annex.thin has caused data loss to the content of locked files. 2019-03-18 15:59:43 -04:00
Mirror.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Move.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Multicast.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
NotifyChanges.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
NumCopies.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
P2P.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
P2PStdIO.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
PostReceive.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
PreCommit.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Proxy.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
ReadPresentKey.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
RecvKey.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
RegisterUrl.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Reinit.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Reinject.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
ReKey.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
RemoteDaemon.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
RenameRemote.hs prevent renaming to name already in use 2019-04-16 12:23:46 -04:00
Repair.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Required.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
ResolveMerge.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
RmUrl.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Schedule.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Semitrust.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
SendKey.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
SetKey.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
SetPresentKey.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Smudge.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Status.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Sync.hs Made git-annex sync --content much faster when all the remotes it's syncing with are export/import remotes 2019-04-10 12:42:10 -04:00
Test.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
TestRemote.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
TransferInfo.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
TransferKey.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
TransferKeys.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Trust.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Unannex.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Undo.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Ungroup.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Uninit.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Unlock.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Untrust.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Unused.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Upgrade.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
VAdd.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
VCycle.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Version.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
VFilter.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Vicfg.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
View.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
VPop.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Wanted.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Watch.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
WebApp.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Whereis.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00