Merge branch 'master' of ssh://git-annex.branchable.com
This commit is contained in:
Joey Hess
commit
372764ec76
6 changed files with 339 additions and 0 deletions
138
doc/bugs/Unable_to_copy_from_Android.mdwn
Normal file
138
doc/bugs/Unable_to_copy_from_Android.mdwn
Normal file
|
|
@ -0,0 +1,138 @@
|
|||
### Please describe the problem.
|
||||
|
||||
I am unable to copy files from my Android git annex repository into a remote repository on a Ubuntu machine.
|
||||
It was previously working fine, but after recent upgrades, it throws odd errors and refuses to copy the files.
|
||||
|
||||
### What steps will reproduce the problem?
|
||||
|
||||
Run this command:
|
||||
|
||||
`git annex copy --to remote Path/To/File.txt`
|
||||
|
||||
### What version of git-annex are you using? On what operating system?
|
||||
|
||||
Souce Android Tablet
|
||||
|
||||
[[!format sh """
|
||||
git-annex version: 5.20131221-gf8c928d
|
||||
build flags: Assistant Webapp Testsuite S3 WebDAV Inotify XMPP 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 glacier hook
|
||||
local repository version: 5
|
||||
default repository version: 3
|
||||
supported repository versions: 3 5
|
||||
upgrade supported from repository versions: 0 1 2 4
|
||||
"""]]
|
||||
|
||||
Destination Ubuntu server
|
||||
|
||||
[[!format sh """
|
||||
git-annex version: 5.20131224-g692aa01
|
||||
build flags: Assistant Webapp Pairing S3 WebDAV Inotify DBus XMPP Feeds Quvi TDFA
|
||||
key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SHA256 SHA1 SHA512 SHA224 SHA384 WORM URL
|
||||
remote types: git gcrypt S3 bup directory rsync web webdav glacier hook
|
||||
"""]]
|
||||
|
||||
### 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
|
||||
|
||||
git annex copy --to gimli Books/Laravel/laravel.mobi
|
||||
copy Books/Laravel/laravel.mobi (checking gimli...) git-annex: Not in a git repository.
|
||||
(to gimli...) git-annex: unknown command recvkey
|
||||
|
||||
Usage: git-annex command [option ...]
|
||||
|
||||
Commonly used commands:
|
||||
|
||||
add [PATH ...] add files to annex
|
||||
addurl URL ... add urls to annex
|
||||
assistant automatically handle changes
|
||||
copy [PATH ...] copy content of files to/from another repository
|
||||
drop [PATH ...] indicate content of files not currently wanted
|
||||
edit [PATH ...] same as unlock
|
||||
get [PATH ...] make content of annexed files available
|
||||
import [PATH ...] move and add files from outside git working copy
|
||||
importfeed URL ... import files from podcast feeds
|
||||
lock [PATH ...] undo unlock command
|
||||
mirror [PATH ...] mirror content of files to/from another repository
|
||||
move [PATH ...] move content of files to/from another repository
|
||||
rmurl FILE URL record file is not available at url
|
||||
status [PATH ...] show the working tree status
|
||||
sync [REMOTE ...] synchronize local repository with remotes
|
||||
unlock [PATH ...] unlock files for modification
|
||||
watch watch for changes
|
||||
webapp launch webapp
|
||||
|
||||
Repository setup commands:
|
||||
|
||||
dead REMOTE ... hide a lost repository
|
||||
describe REMOTE DESC change description of a repository
|
||||
direct switch repository to direct mode
|
||||
enableremote NAME [K=V ...] enables use of an existing special remote
|
||||
group REMOTE DESC add a repository to a group
|
||||
indirect switch repository to indirect mode
|
||||
init DESC initialize git-annex
|
||||
initremote NAME [K=V ...] creates a special (non-git) remote
|
||||
schedule REMOTE [EXPR] get or set scheduled jobs
|
||||
semitrust REMOTE ... return repository to default trust level
|
||||
trust REMOTE ... trust a repository
|
||||
ungroup REMOTE DESC remove a repository from a group
|
||||
untrust REMOTE ... do not trust a repository
|
||||
vicfg edit git-annex's configuration
|
||||
wanted REMOTE [EXPR] get or set preferred content expression
|
||||
|
||||
Repository maintenance commands:
|
||||
|
||||
addunused NUM|RANGE ... add back unused files
|
||||
dropunused NUM|RANGE ... drop unused file content
|
||||
fix [PATH ...] fix up symlinks to point to annexed content
|
||||
forget prune git-annex branch history
|
||||
fsck [PATH ...] check for problems
|
||||
merge automatically merge changes from remotes
|
||||
repair recover broken git repository
|
||||
unused look for unused file content
|
||||
upgrade upgrade repository layout
|
||||
|
||||
Query commands:
|
||||
|
||||
find [PATH ...] lists available files
|
||||
help display help
|
||||
info [PATH ...] shows general information about the annex
|
||||
list [PATH ...] show which remotes contain files
|
||||
log [PATH ...] shows location log
|
||||
map generate map of repositories
|
||||
version show version info
|
||||
whereis [PATH ...] lists repositories that have file content
|
||||
|
||||
Utility commands:
|
||||
|
||||
migrate [PATH ...] switch data to different backend
|
||||
reinject SRC DEST sets content of annexed file
|
||||
unannex [PATH ...] undo accidential add command
|
||||
uninit [PATH ...] de-initialize git-annex and clean out repository
|
||||
|
||||
Plumbing commands:
|
||||
|
||||
dropkey KEY ... drops annexed content for specified keys
|
||||
examinekey KEY ... prints information from a key
|
||||
fromkey KEY PATH adds a file using a specific key
|
||||
lookupkey FILE ... looks up key used for file
|
||||
pre-commit [PATH ...] run by git pre-commit hook
|
||||
rekey [PATH KEY ...] change keys used for files
|
||||
transferkey KEY transfers a key from or to a remote
|
||||
transferkeys transfers keys
|
||||
xmppgit git to XMPP relay
|
||||
|
||||
rsync: connection unexpectedly closed (0 bytes received so far) [sender]
|
||||
rsync error: error in rsync protocol data stream (code 12) at io.c(224) [sender=3.1.0dev]
|
||||
|
||||
|
||||
rsync failed -- run git annex again to resume file transfer
|
||||
failed
|
||||
git-annex: copy: 1 failed
|
||||
|
||||
# End of transcript or log.
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
[[!comment format=mdwn
|
||||
username="http://id.clacke.se/"
|
||||
nickname="clacke"
|
||||
subject="dup"
|
||||
date="2013-12-27T04:18:16Z"
|
||||
content="""
|
||||
Looks like a duplicate of [[android_cannot_get_from_5.20131221]].
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
### Please describe the problem.
|
||||
While attempting to create a remote repository, the assistant is trying to set up public key authentication, but fails when trying to delete the temporary files. Perhaps this doesn't need to be a fatal error; it could warn the user instead, or try again later.
|
||||
|
||||
DeleteFile "C:\\Users\\FAMILY~1\\AppData\\Local\\Temp\\git-annex-keygen.1\\key.pub": permission denied (The process cannot access the file because it is being used by another process.)
|
||||
|
||||
### What steps will reproduce the problem?
|
||||
Create a remote repository
|
||||
|
||||
### What version of git-annex are you using? On what operating system?
|
||||
Windows 7, git-annex version 5.20131221-gf8c928d
|
||||
|
|
@ -0,0 +1,165 @@
|
|||
### Please describe the problem.
|
||||
Syncing two standalones: amd64 and armel.
|
||||
|
||||
Sync works from armel to amd64.
|
||||
|
||||
Sync fails (missing git-upload-pack, git-receive-pack) from amd64 to armel.
|
||||
|
||||
### What steps will reproduce the problem?
|
||||
git-annex sync :)
|
||||
|
||||
### What version of git-annex are you using? On what operating system?
|
||||
git-annex version: 5.20131224-g6ca5271 on both
|
||||
|
||||
### Please provide any additional information below.
|
||||
|
||||
#### on server "rose" (amd64)
|
||||
|
||||
[[!format sh """
|
||||
$ git-annex version
|
||||
git-annex version: 5.20131224-g6ca5271
|
||||
build flags: Assistant Webapp Pairing S3 WebDAV Inotify DBus XMPP Feeds Quvi TDFA
|
||||
key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SHA256 SHA1 SHA512 SHA224 SHA384 WORM URL
|
||||
remote types: git gcrypt S3 bup directory rsync web webdav glacier hook
|
||||
local repository version: 3
|
||||
default repository version: 3
|
||||
supported repository versions: 3 5
|
||||
upgrade supported from repository versions: 0 1 2 4
|
||||
|
||||
$ git-annex sync
|
||||
(merging synced/git-annex into git-annex...)
|
||||
commit ok
|
||||
pull synology
|
||||
ash: git-upload-pack: not found
|
||||
fatal: Could not read from remote repository.
|
||||
|
||||
Please make sure you have the correct access rights
|
||||
and the repository exists.
|
||||
failed
|
||||
push synology
|
||||
ash: git-receive-pack: not found
|
||||
fatal: Could not read from remote repository.
|
||||
|
||||
Please make sure you have the correct access rights
|
||||
and the repository exists.
|
||||
|
||||
Pushing to synology 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
|
||||
$ cat .git/config
|
||||
[core]
|
||||
repositoryformatversion = 0
|
||||
filemode = true
|
||||
bare = false
|
||||
logallrefupdates = true
|
||||
[branch "master"]
|
||||
[annex]
|
||||
uuid = c0e4106e-2631-11e2-9749-1bfa37a61069
|
||||
version = 3
|
||||
[remote "synology"]
|
||||
url = greg@server:/volume1/photo/
|
||||
fetch = +refs/heads/*:refs/remotes/synology/*
|
||||
annex-ssh-options = "-i /home/greg/.ssh/annex.rose_rsa"
|
||||
annex-uuid = ca735977-973c-44bc-9257-915b2c875e39
|
||||
|
||||
greg@rose:~/.ssh$ cat authorized_keys
|
||||
command="/home/greg/.ssh/git-annex-shell" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDT1yE96E/JQNPt0ziiNYJRvndCvLK4uG5h/SNYoAIBF1uH6L7VYAt3HWVqSyi3BcV70WDZ/yWgtNzbrcir46JpvEHMcvYaXLbANwoDGNjG/gsz7kP/8VUxZ6hG3P3ICuwnqVum5+rYXm6oj3xzWPfTRhhRoDZLOQdevSNpdGNaa/lSg8Vuq2suHwjQlQb8AIUuCZmS5cm6XwoUq/jJtN4LTuTPqMjzA6NkdhWM2Kigi9jPQBFborkYBPMphmZwBZiVnhsH1XpaOff+mP03D2gF/huC+b1vbWQstjuehUbY59rvJ4ijbOW8Uq2ep7dwLagmILtX5GbL+GS64pAn9sIP annex-DiskStation
|
||||
|
||||
greg@rose:~/.ssh$ cat git-annex-shell
|
||||
#!/bin/sh
|
||||
set -e
|
||||
exec /home/greg/bin/git-annex.linux/runshell git-annex-shell -c "$SSH_ORIGINAL_COMMAND"
|
||||
|
||||
greg@rose:~/bin/git-annex.linux$ ls
|
||||
bin gconvdir git-annex.MANIFEST git-core lib LICENSE README templates
|
||||
etc git git-annex-shell git-receive-pack lib64 linker runshell usr
|
||||
favicon.png git-annex git-annex-webapp git-upload-pack libdirs logo.svg shimmed
|
||||
"""]]
|
||||
|
||||
#### on "synology" (armel)
|
||||
|
||||
[[!format sh """
|
||||
/volume1/downloads/git-annex.linux $ ./runshell
|
||||
$ git-annex version
|
||||
git-annex version: 5.20131224-g6ca5271
|
||||
build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP 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 glacier hook
|
||||
local repository version: 5
|
||||
default repository version: 3
|
||||
supported repository versions: 3 5
|
||||
upgrade supported from repository versions: 0 1 2 4
|
||||
|
||||
$ which git-receive-pack
|
||||
/volume1/downloads/git-annex.linux/bin/git-receive-pack
|
||||
|
||||
$ which git-upload-pack
|
||||
/volume1/downloads/git-annex.linux/bin/git-upload-pack
|
||||
|
||||
$ git-annex sync
|
||||
commit (Recording state in git...)
|
||||
ok
|
||||
pull rose
|
||||
From server:/home/greg/Media/Pictures/Photos
|
||||
d761e6e..4454a51 git-annex -> rose/git-annex
|
||||
c4f0719..a4c73e4 master -> rose/master
|
||||
ok
|
||||
push rose
|
||||
Counting objects: 134, done.
|
||||
Compressing objects: 100% (58/58), done.
|
||||
Writing objects: 100% (58/58), 4.81 KiB | 0 bytes/s, done.
|
||||
Total 58 (delta 38), reused 0 (delta 0)
|
||||
warning: There are too many unreachable loose objects; run 'git prune' to remove them.
|
||||
To greg@server:/home/greg/Media/Pictures/Photos
|
||||
4454a51..812c393 git-annex -> synced/git-annex
|
||||
ok
|
||||
|
||||
$ cat .git/config
|
||||
[core]
|
||||
repositoryformatversion = 0
|
||||
filemode = true
|
||||
bare = true
|
||||
logallrefupdates = true
|
||||
[branch "master"]
|
||||
[annex]
|
||||
uuid = ca735977-973c-44bc-9257-915b2c875e39
|
||||
version = 5
|
||||
direct = true
|
||||
[remote "rose"]
|
||||
url = greg@server:/home/greg/Media/Pictures/Photos
|
||||
fetch = +refs/heads/*:refs/remotes/rose/*
|
||||
annex-ssh-options = "-i /var/services/homes/greg/.ssh/annex_rsa"
|
||||
annex-trustlevel = trusted
|
||||
annex-uuid = c0e4106e-2631-11e2-9749-1bfa37a61069
|
||||
|
||||
$ cat /volume1/homes/greg/.ssh/authorized_keys
|
||||
...partial...
|
||||
command="/var/services/homes/greg/.ssh/git-annex-shell" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCYvOZK2rO+3cF1wxxxrXptZ/QbRaOy36p9RtFmE5MKxgBRJ7n/8nMfBGaj3KDXcdJG+dTUsmLY5VeULuM4omtfJrF2MFYZDw2N0Qgq1bnYZ+q4OlpHfI3h77dAxyvM1MXYJvewXsjh8XoQJYqE8Pj4C05YsAJrqQJqqQqVZceD4TPvbKgnQhQIE2mCVXfItucJv0TOOBmKguOQGUB4Jp00IvFsnxpCLDeLFIODjRpXQqcMX9cZ9/6OYLznTck/MdbA5KTev1gVwiGwtYFGqY/DJ7q6zqfE+UU2aKS/M0r0Qjvr2+Q4+CuzVYc+hPURC8phmdP+HjtFcVsEcpsl6p79 annex-rose
|
||||
|
||||
/volume1/homes/greg/.ssh $ cd /volume1/homes/greg/.ssh/
|
||||
/volume1/homes/greg/.ssh
|
||||
/volume1/homes/greg/.ssh $ ls
|
||||
annex_rsa authorized_keys id_rsa known_hosts
|
||||
annex_rsa.pub git-annex-shell id_rsa.pub
|
||||
/volume1/homes/greg/.ssh $ cd /var/services/homes/greg/.ssh/
|
||||
/volume1/homes/greg/.ssh $ pwd
|
||||
/var/services/homes/greg/.ssh
|
||||
|
||||
/volume1/homes/greg/.ssh $ cat git-annex-shell
|
||||
#!/bin/sh
|
||||
set -e
|
||||
exec /volume1/downloads/git-annex.linux/runshell git-annex-shell -c "$SSH_ORIGINAL_COMMAND"
|
||||
|
||||
/volume1/downloads/git-annex.linux $ ls
|
||||
LICENSE git-annex-shell linker
|
||||
README git-annex-webapp logo.svg
|
||||
bin git-annex.MANIFEST runshell
|
||||
etc git-core shimmed
|
||||
favicon.png git-receive-pack templates
|
||||
gconvdir git-upload-pack usr
|
||||
git lib
|
||||
git-annex libdirs
|
||||
"""]]
|
||||
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
[[!comment format=mdwn
|
||||
username="http://joeyh.name/"
|
||||
ip="209.250.56.227"
|
||||
subject="comment 1"
|
||||
date="2013-12-26T23:06:34Z"
|
||||
content="""
|
||||
Run `git annex info` instead. That is what older versions of git-annex called `git annex status`
|
||||
|
||||
Meanwhile, `git annex status` is now like `git status` -- it shows an overview of uncommitted changes in your work tree.
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://openid.stackexchange.com/user/e65e6d0e-58ba-41de-84cc-1f2ba54cf574"
|
||||
nickname="Mica Semrick"
|
||||
subject="Thanks!"
|
||||
date="2013-12-27T01:37:36Z"
|
||||
content="""
|
||||
Not sure how I missed that :D
|
||||
"""]]
|
||||
Loading…
Reference in a new issue