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

This commit is contained in:
Joey Hess 2014-05-10 11:33:52 -03:00
commit 7c4c7bd05b
2 changed files with 60 additions and 0 deletions

View file

@ -0,0 +1,39 @@
### Please describe the problem.
git uses environment variable GIT_SSH to determine SSH client.
I set it to plink.exe because I extensively use pageant infrastructure and do NOT want to have 2 systems lying around.
Unfortunately git-annex seems to ignore that.
Even worse, it results in unpredicted behavior because the git part works (e.g. clone) whereas annex/rsync does not resulting in half-ok repositories without meaningful error messages.
It only becomes evident when ssh.exe in the git repository is deleted.
### What steps will reproduce the problem?
Set %GIT_SSH% and remove ssh.exe
You will get
git-annex: ssh: createProcess: does not exist (No such file or directory)
failed
git-annex: drop: 1 failed
### What version of git-annex are you using? On what operating system?
Windows 8,
$ git annex version
git-annex version: 5.20140411-gda795e0
build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV DNS Feeds Quvi TDFA CryptoHash
key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier hook external
local repository version: 5
supported repository version: 5
upgrade supported from repository versions: 2 3 4
### Please provide any additional information below.

View file

@ -45,4 +45,25 @@ EDIT2: When I continue on the windows side (despite the warning):
But that's not true, git-annex is definitely installed on the server (it's just the Debian package and it resides in /usr/bin/git-annex). In any case, the client repository is still empty
EDIT3: Struggle, struggle, ...
Finally, for whatever reason, the client dir is not empty. What seems to be missing on the server was:
git annex sync
but this is never written (also not in the walkthrough). Can anyone tell me if it's required and why?
Furthermore, even that I "see" at least the file references now, I am not able to get them:
$ git annex get apps
get apps/gitignore (not available)
Try making some of these repositories available:
10d0ffd8-f499-4b55-83e6-ff58cd98edc5 -- server
(Note that these git remotes have annex-ignore set: origin)
failed
git-annex: get: 1 failed
That's an SSH remote, it *is* available! What is meant by that?