mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2022-01-11 12:25:12 -04:00
commit c031d19c32
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
9 changed files with 233 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
doc/special_remotes/gcrypt/comment_1_16a7b4978a58284b5ab3c58f2102e9d0._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="aaron"
avatar="http://cdn.libravatar.org/avatar/8a07e2f7af4bbf1bfcb48bbc53e00747"
subject="How does the gcrypt type compare to the rsync special remote"
date="2022-01-09T05:31:34Z"
content="""
For systems (such as rsync.net) that allow us to use both rsync and git-annex, which is the better option? I noticed that the default for rsync.net was this type (gcrypt), does it provide additional capabilities or perform slightly better than the [rsync version](https://git-annex.branchable.com/special_remotes/rsync/)?
"""]]

10
doc/special_remotes/gcrypt/comment_2_08245fd6716ee3ed5ac98fe95e7d5ca1._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="tomdhunt"
avatar="http://cdn.libravatar.org/avatar/02694633d0fb05bb89f025cf779218a3"
subject="comment 2"
date="2022-01-09T05:45:35Z"
content="""
The gcrypt special remote is for use with the git-remote-gcrypt protocol for making encrypted git remotes. The rsync special remote can also encrypt the files it stores, but it's not related to git-remote-gcrypt; it just puts files in a plain directory tree using rsync.
If you want to keep a repository remote (not a special remote) on your rsync.net host, and want it to be encrypted, then you can use git-remote-gcrypt and use this special remote so that the data is all together. If you're not using git-remote-gcrypt, then the rsync special remote is what you want.
"""]]

53
doc/special_remotes/gcrypt/comment_3_2b22c692fb98be1a964430b5b1a329a9._comment Normal file
View file

@ -0,0 +1,53 @@
[[!comment format=mdwn
username="aaron"
avatar="http://cdn.libravatar.org/avatar/8a07e2f7af4bbf1bfcb48bbc53e00747"
subject="comment 3"
date="2022-01-09T08:36:34Z"
content="""
@tomdhunt, Are you saying that the difference is the rsync remote only contains the files and the actual history stuff from git isn't tracked in it while the git-remote-gcrypt one also tracks history because it is a bare git repo?
Additionally, I just started trying out the grcrypt version on rsync.net and it seems to use a slightly different initialization when compared to the others. I've made some progress, but I am still not quite able to make it work, it seems that I'm having issues initializing the bare remote when I do it via the terminal. If I don't try to create a bare and push it the first commit completely fails, I seem to be able to make more progress by creating a bare, pushing it, and then adding it (but it still fails). This is what I have got to so far:
```bash
user@localhost:$ sudo chown <rsync.net user>:<rsync.net user> -R
user@localhost:$ git init --bare shared=group test_repo.git
user@localhost:$ sudo rsync -vrSP test_repo.git <rsync.net user>@<server>:annex
user@localhost:$ git annex initremote \"<some_userful_name>\" type=gcrypt gitrepo=<rsync.net user>@<server>:annex chunk=1MiB keyid=<key_id> encryption=shared mac=HMACSHA512 autoenable=true
```
The error message that I get:
```bash
user@localhost:$ git annex sync
commit
On branch master
Initial commit
nothing to commit (create/copy files and use \"git add\" to track)
ok
pull <rsync.net server>
gcrypt: Decrypting manifest
gpg: selecting card failed: No such device
gpg: Signature made Sun 09 Jan 2022 08:26:18 AM GMT
gpg: using EDDSA key <key>
gpg: Good signature from \"<key comment>\" [ultimate]
merge: refs/remotes/<remote name>/master - not something we can merge
merge: refs/remotes/<remote name>/synced/master - not something we can merge
failed
sync: 1 failed
```
It also looks like this method fails to add `gcrypt-participants = <key>` and `gcrypt-signingkey = <key>` to the `.git/config` file like webapp does.
Furthermore, when I use the `git annex webapp` to generate the repo, it does something that seems to be even more different (and successfully creates the bare repo by itself), specifically the URL looks something like this:
```bash
url = gcrypt::<rsync.net user>@git-annex-.<country>.2D<server_subname?>.2E<server_name>.2E<server_domain>-<rsync.net user>_22_annex:annex/
```
It seems to be encoding some of the characters to make a URL? Is there another web API that we can interact with?
"""]]