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

This commit is contained in:
Joey Hess 2014-11-04 16:45:51 -04:00
commit 6130a51aa1
2 changed files with 164 additions and 0 deletions

View file

@ -0,0 +1,29 @@
### Please describe the problem.
The web app fails with an Internal server error while adding a remote server on Windows.
ssh: createProcess: does not exist (No such file or directory)
### What steps will reproduce the problem?
Start the webapp, click add repository, select remote server, click check.
### What version of git-annex are you using? On what operating system?
Latest (as of 20141104) on Windows.
### 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
[2014-11-04 12:42:27 ora solare Europa occidentale] main: starting assistant version 5.20141031-gbfac20c
Launching web browser on file://C:\Users\ltaglialegne\Documents\Annex\.git\annex\webapp.html
[2014-11-04 12:42:27 ora solare Europa occidentale] Cronner: You should enable consistency checking to protect your data.
(scanning...) [2014-11-04 12:42:27 ora solare Europa occidentale] Watcher: Performing startup scan
(started...) recv: failed (No error)
recv: failed (No error)
recv: failed (No error)
recv: failed (No error)
04/Nov/2014:12:44:30 +0100 [Error#yesod-core] ssh: createProcess: does not exist (No such file or directory) @(yesod-core-1.2.19:Yesod.Core.Class.Yesod .\Yesod\Core\Class\Yesod.hs:503:5)
04/Nov/2014:12:44:50 +0100 [Error#yesod-core] ssh: createProcess: does not exist (No such file or directory) @(yesod-core-1.2.19:Yesod.Core.Class.Yesod .\Yesod\Core\Class\Yesod.hs:503:5)
# End of transcript or log.
"""]]

View file

@ -0,0 +1,135 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawmp1ThsNNAbSn46ju-gwFELfStlhl8usJo"
nickname="donkeyicydragon"
subject="git annex sync --debug and git config --list output "
date="2014-11-04T11:28:05Z"
content="""
Hi Joey,
I haven't installed any hooks there myself. These are all hooks in .git/hooks:
* applypatch-msg.sample
* commit-msg.sample
* post-update.sample
* pre-applypatch.sample
* pre-commit
* pre-commit.sample
* prepare-commit-msg.sample
* pre-push.sample
* pre-rebase.sample
* update.sample
[[!format sh \"\"\"
$ git annex sync --debug
[2014-11-04 12:13:31 CET] read: git [\"--git-dir=/home/marek/annex/.git\",\"--work-tree=/home/marek/annex\",\"show-ref\",\"git-annex\"]
[2014-11-04 12:13:31 CET] read: git [\"--git-dir=/home/marek/annex/.git\",\"--work-tree=/home/marek/annex\",\"show-ref\",\"--hash\",\"refs/heads/git-annex\"]
[2014-11-04 12:13:31 CET] read: git [\"--git-dir=/home/marek/annex/.git\",\"--work-tree=/home/marek/annex\",\"log\",\"refs/heads/git-annex..989b2da3eedef22fffffa2d83d0f9d0012afaa7d\",\"-n1\",\"--pretty=%H\"]
[2014-11-04 12:13:31 CET] read: git [\"--git-dir=/home/marek/annex/.git\",\"--work-tree=/home/marek/annex\",\"log\",\"refs/heads/git-annex..5681753eabba653efd94b6e87b2d117e559889e1\",\"-n1\",\"--pretty=%H\"]
[2014-11-04 12:13:31 CET] read: git [\"--git-dir=/home/marek/annex/.git\",\"--work-tree=/home/marek/annex\",\"log\",\"refs/heads/git-annex..1632d8479f92ee30c9980c154669dfd5734bb8b0\",\"-n1\",\"--pretty=%H\"]
[2014-11-04 12:13:31 CET] chat: git [\"--git-dir=/home/marek/annex/.git\",\"--work-tree=/home/marek/annex\",\"cat-file\",\"--batch\"]
commit [2014-11-04 12:13:31 CET] read: git [\"--git-dir=/home/marek/annex/.git\",\"--work-tree=/home/marek/annex\",\"commit\",\"-a\",\"-m\",\"git-annex automatic sync\"]
ok
[2014-11-04 12:13:34 CET] read: git [\"--git-dir=/home/marek/annex/.git\",\"--work-tree=/home/marek/annex\",\"symbolic-ref\",\"HEAD\"]
[2014-11-04 12:13:34 CET] read: git [\"--git-dir=/home/marek/annex/.git\",\"--work-tree=/home/marek/annex\",\"show-ref\",\"refs/heads/master\"]
[2014-11-04 12:13:34 CET] call: git [\"--git-dir=/home/marek/annex/.git\",\"--work-tree=/home/marek/annex\",\"show-ref\",\"--verify\",\"-q\",\"refs/heads/synced/master\"]
[2014-11-04 12:13:34 CET] read: git [\"--git-dir=/home/marek/annex/.git\",\"--work-tree=/home/marek/annex\",\"log\",\"refs/heads/master..refs/heads/synced/master\",\"-n1\",\"--pretty=%H\"]
pull origin
[2014-11-04 12:13:34 CET] call: git [\"--git-dir=/home/marek/annex/.git\",\"--work-tree=/home/marek/annex\",\"fetch\",\"origin\"]
git-annex: Unknown command 'i3'
Did you mean one of these?
fix
edit
init
find
add
get
vicfg
log
map
drop
move
copy
lock
sync
import
uninit
dead
fsck
direct
help
test
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.
failed
[2014-11-04 12:13:34 CET] read: git [\"--git-dir=/home/marek/annex/.git\",\"--work-tree=/home/marek/annex\",\"show-ref\",\"git-annex\"]
[2014-11-04 12:13:34 CET] read: git [\"--git-dir=/home/marek/annex/.git\",\"--work-tree=/home/marek/annex\",\"show-ref\",\"--hash\",\"refs/heads/git-annex\"]
[2014-11-04 12:13:34 CET] read: git [\"--git-dir=/home/marek/annex/.git\",\"--work-tree=/home/marek/annex\",\"log\",\"refs/heads/git-annex..989b2da3eedef22fffffa2d83d0f9d0012afaa7d\",\"-n1\",\"--pretty=%H\"]
[2014-11-04 12:13:34 CET] read: git [\"--git-dir=/home/marek/annex/.git\",\"--work-tree=/home/marek/annex\",\"log\",\"refs/heads/git-annex..5681753eabba653efd94b6e87b2d117e559889e1\",\"-n1\",\"--pretty=%H\"]
[2014-11-04 12:13:34 CET] read: git [\"--git-dir=/home/marek/annex/.git\",\"--work-tree=/home/marek/annex\",\"log\",\"refs/heads/git-annex..1632d8479f92ee30c9980c154669dfd5734bb8b0\",\"-n1\",\"--pretty=%H\"]
[2014-11-04 12:13:34 CET] call: git [\"--git-dir=/home/marek/annex/.git\",\"--work-tree=/home/marek/annex\",\"branch\",\"-f\",\"synced/master\"]
[2014-11-04 12:13:34 CET] call: git [\"--git-dir=/home/marek/annex/.git\",\"--work-tree=/home/marek/annex\",\"show-ref\",\"--verify\",\"-q\",\"refs/remotes/origin/synced/master\"]
[2014-11-04 12:13:34 CET] read: git [\"--git-dir=/home/marek/annex/.git\",\"--work-tree=/home/marek/annex\",\"log\",\"refs/remotes/origin/synced/master..refs/heads/synced/master\",\"-n1\",\"--pretty=%H\"]
push origin
[2014-11-04 12:13:34 CET] call: git [\"--git-dir=/home/marek/annex/.git\",\"--work-tree=/home/marek/annex\",\"push\",\"origin\",\"+git-annex:synced/git-annex\",\"master:synced/master\"]
git-annex: Unknown command 'i3'
Did you mean one of these?
fix
edit
init
find
add
get
vicfg
log
map
drop
move
copy
lock
sync
import
uninit
dead
fsck
direct
help
test
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.
[2014-11-04 12:13:34 CET] read: git [\"--git-dir=/home/marek/annex/.git\",\"--work-tree=/home/marek/annex\",\"push\",\"origin\",\"master\"]
Pushing to origin failed.
(non-fast-forward problems can be solved by setting receive.denyNonFastforwards to false in the remote's git config)
failed
git-annex: sync: 2 failed
\"\"\"]]
### git config --list ###
[[!format sh \"\"\"
user.name=Marek
user.email=marek@xxxx
push.default=simple
core.repositoryformatversion=0
core.filemode=true
core.bare=false
core.logallrefupdates=true
remote.origin.url=i3:/bluepool/data/
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
remote.origin.annex-uuid=90405788-bc2c-466f-96a7-c498ad9cc525
branch.master.remote=origin
branch.master.merge=refs/heads/master
annex.uuid=6c5fe2d0-f6f3-4c4a-ad2d-ed140c111bb6
annex.version=5
\"\"\"]]
"""]]