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

This commit is contained in:
Joey Hess 2019-10-04 11:23:13 -04:00
commit 993c31ec1d
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 99 additions and 0 deletions

View file

@ -0,0 +1,42 @@
### Please describe the problem.
`/usr/bin/git-annex-shell` is linked to `/usr/lib/git-annex.linux/git-annex`, not `/usr/lib/git-annex.linux/git-annex-shell` after installing from git annex standalone rpm using yum.
As a result, commands passed through `git-annex-shell` don't work, but other functions I tried work properly (e.g. initializing repos, adding files). I found the bug after running `git annex get myawesomefile` and getting a confusing error message about `git-annex` usage.
Running `/usr/lib/git-annex.linux/git-annex-shell configlist ~/path/to/my/repo` would produce correct output, but `/usr/bin/git-annex-shell configlist ~/path/to/my/repo` would raise errors. Relinking `/usr/bin/git-annex-shell` seems to have fixed the problem.
### What steps will reproduce the problem?
- Install git annex following these steps: https://git-annex.branchable.com/install/rpm_standalone/
- Run any `git-annex-shell` command. In my case, `git-annex-shell configlist ~/path/to/my/repo`.
### What version of git-annex are you using? On what operating system?
git-annex version: 7.20190912-g05bc37910
build flags: Assistant Webapp Pairing S3 WebDAV Inotify DBus DesktopNotify TorrentParser MagicMime Feeds Testsuite
dependency versions: aws-0.20 bloomfilter-2.0.1.0 cryptonite-0.25 DAV-1.3.3 feed-1.0.0.0 ghc-8.4.4 http-client-0.5.13.1 persistent-sqlite-2.8.2 torrent-10000.1.1 uuid-1.3.13 yesod-1.6.0
operating system: linux x86_64 (CentOS 7)
### Please provide any additional information below.
Here is output from one time I tried to run `git-annex-shell` over ssh. Note that the error message gives usage for `git-annex`, not `git-annex-shell`.
[[!format sh """
$ ssh username@my.remote.server 'git-annex-shell configlist ~/path/to/my/repo'
Invalid argument `configlist'
Usage: git-annex COMMAND
git-annex - manage files with git, without checking their contents in
Commonly used commands:
add PATH ... add files to annex
addurl URL ... add urls to annex
"""]]
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
Git annex does exactly what I want, without the complicated setup or fees of git lfs. Thanks for your work maintaining this project!

View file

@ -0,0 +1,37 @@
### Please describe the problem.
The watcher in `git annex webapp` crashes (see error below).
It seems to be a result of having the file `Icon^M^M` in `.gitignore`
### What steps will reproduce the problem?
1. Add `Icon^M^M` into `.gitignore`
2. Start the webapp
3. See the error in the top right hand side of the screen
### What version of git-annex are you using? On what operating system?
[[!format sh """
git-annex version: 7.20190912
build flags: Assistant Webapp Pairing S3 WebDAV FsEvents TorrentParser MagicMime Feeds Testsuite
dependency versions: aws-0.21.1 bloomfilter-2.0.1.0 cryptonite-0.26 DAV-1.3.3 feed-1.2.0.0 ghc-8.6.5 http-client-0.6.4 persistent-sqlite-2.10.5 torrent-10000.1.1 uuid-1.3.13 yesod-1.6.0
key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384E SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 BLAKE2B256E BLAKE2B256 BLAKE2B512E BLAKE2B512 BLAKE2B160E BLAKE2B160 BLAKE2B224E BLAKE2B224 BLAKE2B384E BLAKE2B384 BLAKE2BP512E BLAKE2BP512 BLAKE2S256E BLAKE2S256 BLAKE2S160E BLAKE2S160 BLAKE2S224E BLAKE2S224 BLAKE2SP256E BLAKE2SP256 BLAKE2SP224E BLAKE2SP224 SHA1E SHA1 MD5E MD5 WORM URL
remote types: git gcrypt p2p S3 bup directory rsync web bittorrent webdav adb tahoe glacier ddar git-lfs hook external
operating system: darwin x86_64
supported repository versions: 7
upgrade supported from repository versions: 0 1 2 3 4 5 6
local repository version: 7
"""]]
Running on MacOS 10.13.6
### Please provide any additional information below.
[[!format sh """
Watcher crashed: unknown response from git cat-file ("HEAD:./Library/Icon missing",Ref "HEAD:./Library/Icon\r")
CallStack (from HasCallStack):
error, called at ./Git/CatFile.hs:119:28 in main:Git.CatFile
"""]]
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
Yes! Been using it since the start. Donated. Will donate again if you run a funding run.

View file

@ -0,0 +1,20 @@
Hi,
I am experiencing slow transfer (UL/DL) speed with an S3-compatible remote.
Here is the configuration:
-Minio server for S3 storage in docker.
-Nginx for https in docker.
-git-annex (and datalad) with the S3 set as a remote, without public URL to control access.
I tried to get files directly from the server to remove all the network factors.
When downloading from the Minio server through nginx with wget, I have transfer rates of about 50-60MB/s.
When running `git annex get` on the same file, the transfer rate is about 6-7MB/s.
Any idea why git-annex would slow the transfer?
Thanks