Merge remote-tracking branch 'origin/master'

This commit is contained in:
Joey Hess 2013-12-24 13:14:44 -04:00
commit 1618510707
16 changed files with 1788 additions and 3 deletions

View file

@ -0,0 +1,13 @@
[0 zerodogg@firefly git-annex]$ ls
bin/ favicon.png git-annex git-annex-shell git-core/ lib/ libdirs linker README shimmed/ uninstall
etc/ gconvdir git-annex.MANIFEST git-annex-webapp install-haskell-packages lib64/ LICENSE logo.svg runshell templates/ usr/
[0 zerodogg@firefly git-annex]$ pwd
/home/zerodogg/.local/share/git-annex
[0 zerodogg@firefly git-annex]$ ./git-annex version
/home/zerodogg/.local/share/git-annex/bin/git-annex: line 2: /home/zerodogg/.local/share/git-annex/lib64/ld-linux-x86-64.so.2: No such file or directory
[127 zerodogg@firefly git-annex]$ ls -l /home/zerodogg/.local/share/git-annex/lib64/ld-linux-x86-64.so.2
lrwxrwxrwx. 1 zerodogg zerodogg 32 2012-12-30 16:35 /home/zerodogg/.local/share/git-annex/lib64/ld-linux-x86-64.so.2 -> /lib/x86_64-linux-gnu/ld-2.13.so
[0 zerodogg@firefly git-annex]$ ls /lib/x86_64-linux-gnu/ld-2.13.so
ls: cannot access /lib/x86_64-linux-gnu/ld-2.13.so: No such file or directory
This is on Fedora 20, 64bit, installed from http://downloads.kitenet.net/git-annex/linux/current/git-annex-standalone-amd64.tar.gz as of Sun Dec 22 00:44:53 CET 2013.

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="EskildHustvedt"
ip="80.202.194.17"
subject="32 bit standalone works (on 64 bit) however"
date="2013-12-22T11:37:24Z"
content="""
SSIA
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawmTlfbCC37CAjhQrS107ZWRVA_sF4s3gLU"
nickname="Juergen"
subject="Same here broken "
date="2013-12-22T12:11:57Z"
content="""
It's broken here too. Debian testing 64bit .
"""]]

View file

@ -0,0 +1,18 @@
[[!comment format=mdwn
username="http://id.clacke.se/"
nickname="clacke"
subject="Workaround/Fix"
date="2013-12-22T14:23:09Z"
content="""
Broken here on Linux Mint 13 Maya (Ubuntu 12.04 precise) too. The reason is a dangling symlink. Fix:
clacke@acozed:~/.local/libexec/git-annex.linux.5.20131221$ ./git-annex version
Segmentation fault
clacke@acozed:~/.local/libexec/git-annex.linux.5.20131221$ rm lib64/ld-linux-x86-64.so.2
clacke@acozed:~/.local/libexec/git-annex.linux.5.20131221$ ln -s ../lib/x86_64-linux-gnu/ld-linux-x86-64.so.2 lib64/
clacke@acozed:~/.local/libexec/git-annex.linux.5.20131221$ ./git-annex version
git-annex version: 5.20131221-gf8c928d
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
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://grossmeier.net/"
nickname="greg"
subject="comment 4"
date="2013-12-23T16:45:23Z"
content="""
clacke's workaround works for me, as well, on 5.20131223-gafb776f (ie: issue still present on 5.20131223-gafb776f)
"""]]

View file

@ -0,0 +1,21 @@
### Please describe the problem.
While trying to diagnose [[bugs/armel_standalone:_git-upload-pack_and_-receive-pack_not_shimmed/]] I updated the version of the standalone git-annex on Server A from 3.20121017 to the latest not daily build.
### What steps will reproduce the problem?
1. download git-annex standalone for amd64 (I did both the normal not-daily build, and the daily build, same thing in both)
2. extract
3. ./runshell
### What version of git-annex are you using? On what operating system?
Debian amd64 (yes... I know, blame asheesh)
### Please provide any additional information below.
[[!format sh """
greg@rose:~/bin/git-annex.linux$ ./runshell
exec: 2: /home/greg/bin/git-annex.linux/lib64/ld-linux-x86-64.so.2: not found
"""]]
### Indeed a dupe ###
Thanks clacke, [[done]] - Greg

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://id.clacke.se/"
nickname="clacke"
subject="dup"
date="2013-12-23T12:50:04Z"
content="""
Seems to be a duplicate of [[Latest_64_bit_standalone_Linux_build_broken]].
"""]]

View file

@ -0,0 +1,28 @@
## Reproduce
- run `git annex get --from mylinuxbox` on git-annex Android 5.20131213 or 5.20131221
- `mylinuxbox` is running 5.20131221 standalone
## Expected result
The Android box gets the missing file.
## Actual result
git-annex: unknown command sendkey
## Workaround
Run 5.20131213 on `mylinuxbox`, which does not have this problem.
## Additional
linux standalone 5.20131213 and 5.20131221 are both able to `get` from linux standalone 5.20131221 -- this only affects the Android version.
*Edit:* On second thought, Android is not the only distinguishing factor. Apart from being Android, the box and repo having trouble have the following distinguishing factors from the ones I tried that worked:
- Android
- Direct mode
- Remote was set up by the Assistant
> [[clacke]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U"
nickname="Carlo"
subject="comment 1"
date="2013-12-22T17:57:24Z"
content="""
Same problem on copy --to, but says \"unknown command recvkey\". sender is linux x64, receiver is raspberry pi.
"""]]

View file

@ -0,0 +1,36 @@
[[!comment format=mdwn
username="etset"
ip="188.83.117.67"
subject="comment 2"
date="2013-12-23T13:35:18Z"
content="""
Same problem here: When I try `git annex get $somefile --debug --from $remote` in my laptop with 5.20131221, with the remote being a ssh remote on a server running 5.20131222-g487b01c, the output shows:
[2013-12-23 13:03:17 WET] read: git [\"--git-dir=/home/etset/annex/.git\",\"--work-tree=/home/etset/annex\",\"ls- files\",\"--cached\",\"-z\",\"--\",\"running.gnumeric\"]
get running.gnumeric [2013-12-23 13:03:17 WET] read: git [\"--git-dir=/home/etset/annex/.git\",\"--work-tree=/home/etset/annex\",\"show-ref\",\"git-annex\"]
[2013-12-23 13:03:17 WET] read: git [\"--git-dir=/home/etset/annex/.git\",\"--work-tree=/home/etset/annex\",\"show-ref\",\"--hash\",\"refs/heads/git-annex\"]
[2013-12-23 13:03:17 WET] read: git [\"--git-dir=/home/etset/annex/.git\",\"--work-tree=/home/etset/annex\",\"log\",\"refs/heads/git-annex..32bf5294e7fda349e689b40f3e6627d58067a455\",\"--oneline\",\"-n1\"]
[2013-12-23 13:03:17 WET] read: git [\"--git-dir=/home/etset/annex/.git\",\"--work-tree=/home/etset/annex\",\"log\",\"refs/heads/git-annex..338e69ac06c3602f8e3a01390dad3be039203935\",\"--oneline\",\"-n1\"]
[2013-12-23 13:03:17 WET] read: git [\"--git-dir=/home/etset/annex/.git\",\"--work-tree=/home/etset/annex\",\"log\",\"refs/heads/git-annex..1682681264cd47e1721203485f8f43b09bdf9e61\",\"--oneline\",\"-n1\"]
[2013-12-23 13:03:17 WET] chat: git [\"--git-dir=/home/etset/annex/.git\",\"--work-tree=/home/etset/annex\",\"cat-file\",\"--batch\"]
(from server...)
[2013-12-23 13:03:17 WET] read: rsync [\"--progress\",\"--inplace\",\"-e\",\"'ssh' '-S' '.git/annex/ssh/47d5752367356bb61361fd5cf9c1ec32' '-o' 'ControlMaster=auto' '-o' 'ControlPersist=yes' '-T' 'etset@server.lan' 'git-annex-shell ''sendkey'' ''/mnt/disk/annex/'' ''SHA256E-s17623--c547d78c210676ba17f418ffa1171094900bb863298c01eb497af8f75f64353f'' --uuid ff21315c-8faa-430c-ae7e-c7bbb468071b ''--'' ''remoteuuid=21141b76-9875-45c2-b5ea-a165ad983a85'' ''direct=1'' ''associatedfile=running.gnumeric'' ''--'''\",\"--\",\"dummy:\",\"/home/etset/annex/.git/annex/tmp/SHA256E-s17623--c547d78c210676ba17f418ffa1171094900bb863298c01eb497af8f75f64353f\"]
git-annex: unknown command sendkey
Usage: git-annex command [option ...]
[ ...long list of possible commands here... ]
rsync: connection unexpectedly closed (0 bytes received so far) [Receiver]
rsync error: error in rsync protocol data stream (code 12) at io.c(226) [Receiver=3.1.0]
rsync failed -- run git annex again to resume file transfer
Unable to access these remotes: server
Try making some of these repositories available:
ff21315c-8faa-430c-ae7e-c7bbb468071b -- server (etset@server.lan:/mnt/disk/annex)
ff4f4c32-ad94-45f4-8b3f-f7d843d7c496 -- u0_a178@localhost:/sdcard/annex
failed
git-annex: get: 1 failed
"""]]

View file

@ -0,0 +1,20 @@
### Please describe the problem.
When syncing from server A (real server) to server B (a synology NAS) it fails on git-upload-pack and -receive-pack
### What steps will reproduce the problem?
git-annex sync
### What version of git-annex are you using? On what operating system?
on server A: 3.20121017 (yeah, I should update)
on server B: 5.20131220-g73492b2
### Please provide any additional information below.
On server B, after running ./runshell
[[!format sh """
$ git-upload-pack
/volume1/downloads/git-annex.linux/shimmed/sh/sh: 19: git-upload-pack: not found
$ git-receive-pack
/volume1/downloads/git-annex.linux/shimmed/sh/sh: 20: git-receive-pack: not found
"""]]

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnXlmnJKsPulm2S_hwwRm3Ky27Zyf-wKMw"
nickname="Chad"
subject="After the fact..."
date="2013-12-22T03:51:36Z"
content="""
I've run into a situation where I've inadvertently deleted a file from my Andriod-driven annex repo rather than dropping the file. (A set of very large *.flac files, to be exact.) These are now gone from the repo on my laptop and the repo on my workstation. When looking at the `git --log stat' call, I see the addition of these files, but I do not see their deletion. When running `git annex unused', I found references to the *.flac files, their SHA key, and indeed found the commit they were associated with. I have not dropped these unused files. How to I recover them?
"""]]

View file

@ -359,7 +359,7 @@ subdirectories).
which may be a different repository than the one in which it was
originally created with the initremote command.
The name of the remote is the same name used when origianlly
The name of the remote is the same name used when originally
creating that remote with "initremote". Run "git annex enableremote"
with no parameters to get a list of special remote names.
@ -1112,7 +1112,7 @@ Here are all the supported configuration settings.
content to avoid running out, and additional free space can be reserved
via this option, to make space for more important content (such as git
commit logs). Can be specified with any commonly used units, for example,
"0.5 gb" or "100 KiloBytes"
"0.5 gb", "500M", or "100 KiloBytes"
The default reserve is 1 megabyte.

View file

@ -124,4 +124,4 @@ of you can see it.
git remote add sharedencrypted gcrypt::ssh://hostingsite/myrepo.git
git config remote.sharedencrypted.gcryt-participants "$mykey $friendkey"
git config git push sharedencrypted master git-annex
git push sharedencrypted master git-annex

View file

@ -0,0 +1 @@
[[!meta redir=clacke]]