Merge branch 'master' of ssh://git-annex.branchable.com
This commit is contained in:
commit
278c8dfba6
5 changed files with 102 additions and 0 deletions
|
@ -0,0 +1,33 @@
|
||||||
|
### Please describe the problem.
|
||||||
|
An encrypted remote is added to a working git annex repository (mind ":~/" in the remote add command). However, after that any git annex command fails.
|
||||||
|
|
||||||
|
### What steps will reproduce the problem?
|
||||||
|
> git remote add encrypted gcrypt::ssh://git@gitlab.com:~/gitlabname/reponame.git
|
||||||
|
> git push encrypted master
|
||||||
|
gcrypt: Repository not found: ssh://git@gitlab.com:~/gitlabname/reponame.git
|
||||||
|
gcrypt: Setting up new repository
|
||||||
|
gcrypt: Remote ID is :id:abcdefghijklmnopqrst
|
||||||
|
Counting objects: 53, done.
|
||||||
|
Compressing objects: 100% (52/52), done.
|
||||||
|
Total 53 (delta 12), reused 0 (delta 0)
|
||||||
|
gcrypt: Encrypting to: --throw-keyids --default-recipient-self
|
||||||
|
gcrypt: Requesting manifest signature
|
||||||
|
...
|
||||||
|
To gcrypt::ssh://git@gitlab.com:~/gitlabname/reponame.git
|
||||||
|
* [new branch] master -> master
|
||||||
|
>
|
||||||
|
> git annex sync
|
||||||
|
git-annex: bad url ssh://git@gitlab.com:~/gitlabname/reponame.git
|
||||||
|
|
||||||
|
### What version of git-annex are you using? On what operating system?
|
||||||
|
5.20150419-g900e1b6 on Mac OS X
|
||||||
|
|
||||||
|
### Please provide any additional information below.
|
||||||
|
|
||||||
|
[[!format sh """
|
||||||
|
# If you can, paste a complete transcript of the problem occurring here.
|
||||||
|
# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
|
||||||
|
-
|
||||||
|
|
||||||
|
# End of transcript or log.
|
||||||
|
"""]]
|
|
@ -0,0 +1,16 @@
|
||||||
|
I set up a systemd unit to start the assistant, which works fine (it uses --autostart). When it comes time to stop the unit, however, it calls git annex assistant --stop, which fails because the current directory doesn't have a git annex repository in it.
|
||||||
|
|
||||||
|
git-annex version: 5.20140717
|
||||||
|
build flags: Assistant Inotify DBus Quvi TDFA
|
||||||
|
key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SHA256 SHA1 SHA512 SHA224 SHA384 WORM URL
|
||||||
|
remote types: git gcrypt bup directory rsync web tahoe glacier ddar hook external
|
||||||
|
|
||||||
|
Here's my unit file:
|
||||||
|
[[!format ini """
|
||||||
|
[Service]
|
||||||
|
ExecStart=/usr/bin/git-annex assistant --autostart
|
||||||
|
ExecStop=/usr/bin/git-annex assistant --stop
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=default.target
|
||||||
|
"""]]
|
|
@ -0,0 +1,32 @@
|
||||||
|
### Please describe the problem.
|
||||||
|
|
||||||
|
I added a remote repository, and it successfully tested the ssh connection to the server. Nothing happens, however, once it comes to actually creating the remote repository (or merging with an existing one). It'll just sit there forever, never actually connecting to the server.
|
||||||
|
|
||||||
|
A quick look in process explorer shows something of what's going on: git-annex has launched ssh, and ssh is spamming subprocesses. It's launching ssh.exe which is launching git-annex.exe (yes, on the local machine.) It exits right away, but the command line is "C:\Program Files (x86)\Git\cmd\git-annex.exe" "Please type 'yes' or 'no': ". I've no idea why it's doing that though.
|
||||||
|
|
||||||
|
If I kill that parent ssh process, I get this error message in the transcript:
|
||||||
|
|
||||||
|
Could not create directory '/home/db48x/.ssh'.
|
||||||
|
|
||||||
|
This seems a bit dubious; both my local computer and the remote computer have a ~/.ssh directory.
|
||||||
|
|
||||||
|
In order to rule out a problem with my local computer (an ancient install of Git or cygwin/msys or something, we've tried this on fresh computers which have never had git installed; we get exactly the same problem there.
|
||||||
|
|
||||||
|
### What steps will reproduce the problem?
|
||||||
|
|
||||||
|
Create or connect to a repository via SSH.
|
||||||
|
|
||||||
|
### What version of git-annex are you using? On what operating system?
|
||||||
|
|
||||||
|
Windows 7
|
||||||
|
|
||||||
|
Version: 5.20150420-gb0ebb23
|
||||||
|
Build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV DNS Feeds Quvi TDFA TorrentParser
|
||||||
|
|
||||||
|
### Please provide any additional information below.
|
||||||
|
|
||||||
|
While this is going on, the log has is showing that it's executing the following command:
|
||||||
|
|
||||||
|
[[!format sh """
|
||||||
|
[2015-04-28 22:34:16 Pacific Daylight Time] chat: ssh ["-oNumberOfPasswordPrompts=1","-p","22","db48x@eambar.db48x.net","sh -c 'mkdir -p '\"'\"'annex'\"'\"'&&cd '\"'\"'annex'\"'\"'&&if [ ! -d .git ]; then if [ -x ~/.ssh/git-annex-wrapper ]; then ~/.ssh/git-annex-wrapper git init --bare --shared; else git init --bare --shared; fi && if [ -x ~/.ssh/git-annex-wrapper ]; then ~/.ssh/git-annex-wrapper git config receive.denyNonFastforwards; else git config receive.denyNonFastforwards; fi ;fi&&mkdir -p ~/.ssh&&if [ ! -e ~/.ssh/git-annex-shell ]; then (echo '\"'\"'#!/bin/sh'\"'\"';echo '\"'\"'set -e'\"'\"';echo '\"'\"'if [ \"x$SSH_ORIGINAL_COMMAND\" != \"x\" ]; then'\"'\"';echo '\"'\"'exec git-annex-shell -c \"$SSH_ORIGINAL_COMMAND\"'\"'\"';echo '\"'\"'else'\"'\"';echo '\"'\"'exec git-annex-shell -c \"$@\"'\"'\"';echo '\"'\"'fi'\"'\"') > ~/.ssh/git-annex-shell; fi&&chmod 700 ~/.ssh/git-annex-shell&&touch ~/.ssh/authorized_keys&&chmod 600 ~/.ssh/authorized_keys&&echo '\"'\"'command=\"env GIT_ANNEX_SHELL_DIRECTORY='\"'\"'\"'\"'\"'\"'\"'\"'annex'\"'\"'\"'\"'\"'\"'\"'\"' ~/.ssh/git-annex-shell\",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiPFdIMyYCBmc14f9cUZaG36Zw+NziqX9Z+xGl5GAYq16nORxVc+70Bj+A9cHoHLzTMBJnw7G/f7xJNGbKNgKUPKZohT8AQfg8lnyK8qpyzI2dJB3R0vPBMPxZCBm4IOpdB6ad3B6dUiyNtyMn1hza7GVhIFOsHfGG+K3PGtFgwOz/Zj+2zmcZIL/BHObFsba/yhQxbsjLYPI7mmNV9CLb1+XcR0z2okWvxu28lOrcIXDAdEhp1cjjjpBhwTH1F8/gJcJ6ENBa4JiGt/oEKb1b/pXLaMX6dRjc/gYoy7z0Hw7RD73hH+UtPj5TAeKwoNdaVXdqSsVI+3ql+O5PFTxt db48x@caradhras\n'\"'\"' >>~/.ssh/authorized_keys'"]
|
||||||
|
"""]]
|
|
@ -0,0 +1,10 @@
|
||||||
|
[[!comment format=mdwn
|
||||||
|
username="https://www.google.com/accounts/o8/id?id=AItOawkW9u-8uqR62QBZjeTNCXsL7Ds55dAMGbA"
|
||||||
|
nickname="Horea"
|
||||||
|
subject="comment 2"
|
||||||
|
date="2015-04-28T10:15:24Z"
|
||||||
|
content="""
|
||||||
|
Apparently what happened is that whenever you want to set up git annex, you have to create just one repository, them *move* your files to a temporary folder on all your other media, *clone* the repository to the other media, and then copy all your files back to the clone and add them to git annex. This is a horrible workflow and not mentioned anywhere. If you do the intuitive thing and start by making a bunch of repos, because all repos are created equal, git annex will happily delete all your stuff on some of them.
|
||||||
|
|
||||||
|
Indeed, as you correctly mention, this can go horribly wrong if you use direct mode and cannot recover your files. A shame, really, that direct mode is the only mode in which you actually have write and copy access to your files, and thus, for most - including myself - the only sane way of managing your files. For the record, I was able to retrieve my files, but to this day git annex is the only software I ever used that ever managed to lose my data.
|
||||||
|
"""]]
|
|
@ -0,0 +1,11 @@
|
||||||
|
[[!comment format=mdwn
|
||||||
|
username="anarcat"
|
||||||
|
subject="how does the queue get built now?"
|
||||||
|
date="2015-04-28T21:32:36Z"
|
||||||
|
content="""
|
||||||
|
how does the queue get created now? is it random or is there some deterministic thing that could be abuse to prioritise some content already (say alphabetical order or some similar hack)?
|
||||||
|
|
||||||
|
the scheduling I think i can work around with clunky cron jobs to start/stop the assistant, but the queue I feel is a different beast. would you be available for hire to implement this feature in priority?
|
||||||
|
|
||||||
|
thanks!
|
||||||
|
"""]]
|
Loading…
Add table
Add a link
Reference in a new issue