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

This commit is contained in:
Joey Hess 2014-07-15 00:40:34 -04:00
commit 82adf65067
2 changed files with 45 additions and 0 deletions

View file

@ -0,0 +1,23 @@
[[!comment format=mdwn
username="divB"
ip="128.12.90.218"
subject="comment 4"
date="2014-07-15T03:11:18Z"
content="""
Hi Joey,
Sorry that I bother so much with this.
Thank you so much for your answer. At least with the command line it works now. I had it in %USERPROFILE%/.ssh/ssh_config (where I think it's supposed to be) rather than %USERPROFILE%/.ssh/config. In this file I have a stanza \"Host annex\" with Hostname, Port and IdentityFile set. When I call \"ssh annex\" from the command line everything works. It seems that it also works when I use e.g. \"git annex sync\" from the command line.
However, if I use the webapp, the daemon.log is full of:
Please make sure you have the correct access rights
and the repository exists.
ssh: Could not resolve hostname annex: hostname nor servname provided, or not known
fatal: Could not read from remote repository.
Is it possible that the assistant ignores the ssh config or does something differently?
Thanks again!
"""]]

View file

@ -0,0 +1,22 @@
[[!comment format=mdwn
username="divB"
ip="128.12.90.218"
subject="comment 5"
date="2014-07-15T04:03:16Z"
content="""
After some debugging I found another weird thing which is I think the reason. If I execute
git annex get file.jpg
everything works. But if I do
\"c:\program files (x86)\git\bin\git.exe\" annex get file.jpg
it fails, claiming it can't connect to host \"annex\". I found that there are 3 (!) git.exe installed. When I choose
\"c:\program files (x86)\git\cmd\git.exe\" annex get file.jpg
it works again. When I use \"which git\" in cygwin, it also points me to the \"cmd/git.exe\" version.
So I think this is a bug and git annex assistant should call the executeable in \"cmd\" rather than \"bin\".
Why are there three versions of git.exe at all (one more is in directory libexec/git-core)?
"""]]