mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
git-annex/Command
History
Joey Hess 3eaaec3113
consistently use importKey when available 
This avoids import with --no-content and with --content potentially
generating two different trees, leading to a merge conflict when run in
two different clones of a repo. And it's necessary groundwork to make
git-annex sync --no-content import from special remotes that support
importKey.

Only the directory special remote currently supports importKey, and it
generates the same key as git-annex usually does, so there is no
behavior change for it.

Future special remotes will need to take care when adding importKey,
if it generates different keys. Added some warnings about that to
comments.

This commit was sponsored by Noam Kremen on Patreon.
2020-09-28 15:27:46 -04:00
..
Add.hs allow matching on files whose content is not present 2020-09-28 11:17:46 -04:00
AddUnused.hs Added --no-check-gitignore option for finer grained control than using --force. 2020-09-18 13:19:13 -04:00
AddUrl.hs Added --no-check-gitignore option for finer grained control than using --force. 2020-09-18 13:19:13 -04:00
Adjust.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Assistant.hs avoid using MonadFail in ParseDuration 2020-08-15 15:53:35 -04:00
Benchmark.hs improve benchmark --databases 2019-11-21 17:25:20 -04:00
CalcKey.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
CheckPresentKey.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Commit.hs use Branch.name instead of hard coding the branch name 2020-09-15 15:47:22 -04:00
Config.hs add "input" field to json output 2020-09-15 16:22:44 -04:00
ConfigList.hs all commands building except for assistant 2019-12-05 14:41:18 -04:00
ContentLocation.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Copy.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Dead.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Describe.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
DiffDriver.hs use filepath-bytestring for annex object manipulations 2019-12-11 15:25:07 -04:00
Direct.hs Automatically convert direct mode repositories to v7 with adjusted unlocked branches 2019-08-26 15:05:25 -04:00
Drop.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
DropKey.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
DropUnused.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
EnableRemote.hs cache remote.log 2020-09-22 13:52:26 -04:00
EnableTor.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
ExamineKey.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Expire.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Export.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Find.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
FindRef.hs Ref ByteString conversion done 2020-04-07 17:41:09 -04:00
Fix.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Forget.hs use Branch.name instead of hard coding the branch name 2020-09-15 15:47:22 -04:00
FromKey.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Fsck.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
FuzzTest.hs add "input" field to json output 2020-09-15 16:22:44 -04:00
GCryptSetup.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Get.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Group.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
GroupWanted.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Help.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Import.hs allow matching on files whose content is not present 2020-09-28 11:17:46 -04:00
ImportFeed.hs Added --no-check-gitignore option for finer grained control than using --force. 2020-09-18 13:19:13 -04:00
InAnnex.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Indirect.hs Automatically convert direct mode repositories to v7 with adjusted unlocked branches 2019-08-26 15:05:25 -04:00
Info.hs allow matching on files whose content is not present 2020-09-28 11:17:46 -04:00
Init.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
InitRemote.hs cache remote.log 2020-09-22 13:52:26 -04:00
Inprogress.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
List.hs add "input" field to json output 2020-09-15 16:22:44 -04:00
Lock.hs Added --no-check-gitignore option for finer grained control than using --force. 2020-09-18 13:19:13 -04:00
LockContent.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Log.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
LookupKey.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Map.hs add "input" field to json output 2020-09-15 16:22:44 -04:00
MatchExpression.hs split ProvidedInfo and UserProvidedInfo 2020-09-28 12:12:38 -04:00
Merge.hs use Branch.name instead of hard coding the branch name 2020-09-15 15:47:22 -04:00
MetaData.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Migrate.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Mirror.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Move.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Multicast.hs allow matching on files whose content is not present 2020-09-28 11:17:46 -04:00
NotifyChanges.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
NumCopies.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
P2P.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
P2PStdIO.hs finish CommandStart transition 2019-06-12 13:24:01 -04:00
PostReceive.hs sync --only-annex and annex.synconlyannex 2020-02-17 16:33:10 -04:00
PreCommit.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Proxy.hs Automatically convert direct mode repositories to v7 with adjusted unlocked branches 2019-08-26 15:05:25 -04:00
ReadPresentKey.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
RecvKey.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
RegisterUrl.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Reinit.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Reinject.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
ReKey.hs Added --no-check-gitignore option for finer grained control than using --force. 2020-09-18 13:19:13 -04:00
RemoteDaemon.hs remotedaemon: Don't list --stop in help since it's not supported. 2019-09-30 14:40:46 -04:00
RenameRemote.hs cache remote.log 2020-09-22 13:52:26 -04:00
Repair.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Required.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
ResolveMerge.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
RmUrl.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Schedule.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Semitrust.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
SendKey.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
SetKey.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
SetPresentKey.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Smudge.hs external backends wip 2020-07-29 15:23:18 -04:00
Status.hs convert TopFilePath to use RawFilePath 2019-12-09 15:07:21 -04:00
Sync.hs consistently use importKey when available 2020-09-28 15:27:46 -04:00
Test.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
TestRemote.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
TransferInfo.hs include git-annex-shell back in 2019-12-02 11:51:52 -04:00
TransferKey.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
TransferKeys.hs add back git-annex branch read cache 2020-07-06 12:22:33 -04:00
Trust.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Unannex.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Undo.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Ungroup.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Uninit.hs make git-annex add --no-check-gitignore not skip ignored files, same as with --force 2020-09-18 13:33:35 -04:00
Unlock.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Untrust.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Unused.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Upgrade.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
VAdd.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
VCycle.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Version.hs external backends wip 2020-07-29 15:23:18 -04:00
VFilter.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Vicfg.hs remove redundant imports 2020-06-22 11:05:34 -04:00
View.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
VPop.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Wanted.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Watch.hs remotedaemon: Don't list --stop in help since it's not supported. 2019-09-30 14:40:46 -04:00
WebApp.hs convert to withCreateProcess for async exception safety 2020-06-03 15:48:09 -04:00
Whereis.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00