mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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

Browse source
This commit is contained in:
Joey Hess 2013-08-04 14:09:08 -04:00
commit 47d8172e29
11 changed files with 162 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

22
doc/bugs/Android_v4.3_-_Framework_18_-___34__Git_annex_webapp_CANNOT_LINK_EXECUTABLE:_git-annex_invalid_R__95__ARM__95__COPY_relocation_against_DT__95__SYMBOLIC_shared_library_libc.so___40__built_with_-Bsymbolic__63____41__.mdwn Normal file
View file

@ -0,0 +1,22 @@
### Please describe the problem.
Git-annex v20130802 abends on Android v4.3 framework 18
Android v4.3 - Framework 18 - "Git annex webapp CANNOT LINK EXECUTABLE: git-annex invalid R_ARM_COPY relocation against DT_SYMBOLIC shared library libc.so (built with -Bsymbolic?)
### What steps will reproduce the problem?
Start git-annex
git-annex webapp (auto launch)
### What version of git-annex are you using? On what operating system?
Git-annex v20130802 abends on Android v4.3 framework 18
Android app v1.00.52
### 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
# End of transcript or log.
"""]]

6
doc/bugs/direct_mode_assistant_in_subdir_confusion.mdwn Normal file
View file

@ -0,0 +1,6 @@
I ran the assistant in a subdir in direct mode, and it seemed to move files from other places outside that subdir
into it, and commit them there. These may have been files that needed to be committed, and it just staged them to the wrong place.
I'm pretty sure this does not affect indirect mode.
--[[Joey]]

8
doc/bugs/direct_mode_assistant_in_subdir_confusion/comment_1_351143deec29e712f8718a373ad650d7._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.108.145"
subject="comment 1"
date="2013-08-03T20:15:17Z"
content="""
Only seems to affect initial startup scan; files added outside the subdir after it was started up were not committed (which is the desired behavior when running the webapp in a subdir).
"""]]

8
doc/design/assistant/blog/day_310__release_day/comment_1_1e008583cebd8e373e83729529914db7._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://adamspiers.myopenid.com/"
nickname="Adam"
subject="This makes me happy :-)"
date="2013-08-04T00:46:25Z"
content="""
Glad my work was worth the effort. Thanks for that.
"""]]

23
doc/forum/Is_it_possible_to_make_git-sync_not_nullify_symlinks__63__.mdwn Normal file
View file

@ -0,0 +1,23 @@
Hey,
I've found that git annex works great as a way to publish websites to a web server. I can edit my website on my computer, `git annex sync` my working directory to the VPS, and then `git annex get files-I-want-to-publish`. This works great. I can maintain my normal working directory structure on the VPS and I don't have to worry about people seeing files I DIDN'T want to publish, since the dead symlinks just show up as 404s.
There's one small problem.
Say:
1) I've already published a file using `git annex get file-to-update`
2) I update that file on my computer
3) I do `git annex sync`
4) I do `git annex get file-to-update`
Between steps 3 and 4, file-to-update goes from being an accessible web resource to being a dead symlink. It's not really a problem for me, as hardly anyone visits my site. But it would be nice if I could make `sync` leave the old symlink to the old file until I `get`ed the new one.
Is this possible?
PS: For those who might follow in my footsteps, remember that you probably don't want people reading the contents of your .git dir, so make a re-write rule for this!
Timothy

11
doc/forum/__34__git_annex_copy_--to___60__REMOTE__62___.__34___doesn__39__t_send_it_to_working_directory..mdwn Normal file
View file

@ -0,0 +1,11 @@
I tried to "git annex copy --to SSH-REMOTE" it says it sends it:
copy Test (checking SSH-REMOTE...) (to SSH-REMOTE...)
SHA256E-s6--8283daccd02d2b2797da53446d367e39dc0fb1615bcae4274460f44455bd9822
6 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1)
sent 146 bytes received 31 bytes 354.00 bytes/sec
total size is 6 speedup is 0.03
ok
(Recording state in git...)
But I can't find it in the working directory. Can anyone help me?

1
doc/forum/git_annex_assistant__44___share_with_other_devices.mdwn Normal file
View file

@ -0,0 +1 @@
I am trying to share files between my PC at home at that at work using the walkthrough here: http://git-annex.branchable.com/assistant/remote_sharing_walkthrough/. However, I don't have the option on my machine to "Share with other devices". Any ideas why this would be missing? I am using Ubuntu 13.04 if that helps.

44
doc/install/cabal/comment_11_0d06702e6e0ae3cd331cf748a9f6f273._comment Normal file
View file

@ -0,0 +1,44 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawlXEIT2PEAuHuInLP4UYVzWE0lceMYd2lA"
nickname="Gregor"
subject="Installation on tonidoplug"
date="2013-08-03T07:19:54Z"
content="""
I tried various ways to install git-annex on my [TonidoPlug](http://www.tonidoplug.com/).
System Info:
root@TonidoPlug2:~# uname -a
Linux TonidoPlug2 2.6.31.8-topkick1281p2-001-004-20101214 #1 Thu Jun 16 10:06:20 CST 2011 armv5tel GNU/Linux
`apt-get` didn't work.
root@TonidoPlug2:~# apt-get install git-annex
Reading package lists... Done
Building dependency tree
Reading state information... Done
E: Unable to locate package git-annex
The Linux standalone installation results in an error message like this, when calling `git-annex` (or `git annex`)
~$ git-annex.linux/git-annex
/home/gitolite/git-annex.linux/bin/git-annex: 1: Syntax error: \")\" unexpected
(git-annex.linux/bin/git-annex is a binary file and works fine on other distros)
When installing with cabal, I get the error message (tried as root and gitolite user)
~$ cabal install git-annex --bindir=$HOME/bin -f\"-assistant -webapp -webdav -pairing -xmpp -dns\"
Resolving dependencies...
cabal: cannot configure git-annex-4.20130802. It requires base >=4.5 && <4.8
For the dependency on base >=4.5 && <4.8 there are these packages:
base-4.5.0.0, base-4.5.1.0, base-4.6.0.0 and base-4.6.0.1. However none of
them are available.
base-4.5.0.0 was excluded because of the top level dependency base -any
base-4.5.1.0 was excluded because of the top level dependency base -any
base-4.6.0.0 was excluded because of the top level dependency base -any
base-4.6.0.1 was excluded because of the top level dependency base -any
Any help is appreciated.
Thanks for providing git-annex. I started cleaning up my backups with it yesterday and really like it.
"""]]

14
doc/tips/beware_of_SSD_wear_when_doing_fsck_on_large_special_remotes/comment_2_daf45ce29fed986fa9aa8b173760d0b7._comment Normal file
View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog"
nickname="Michael"
subject="there's a problem"
date="2013-08-04T17:15:05Z"
content="""
If .git/annex/tmp is a symlink to another fs, then adding doesn't work:
add file1.jpg (checksum...)
git-annex: /path/to/.git/annex/tmp/tmp30148: rename: unsupported operation (Invalid cross-device link)
It looks like it would be good to have two types of tmp directories here, one for adding, another one for verifying (and that one could be redirected off SSD).
"""]]

10
doc/todo/A_really_simple_way_to_pair_devices_like_bittorent_sync/comment_4_2bcab1b7998b4df08fca41b8d810f115._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U"
nickname="Richard"
subject="comment 4"
date="2013-08-03T07:12:40Z"
content="""
NAT traversal requires central infrastructure and is unreliable at best. Obviously, a for-profit entity like bittorrent can shoulder that.
For LAN situations, [zeroconf](http://www.zeroconf.org/) along with passphrase-based pairing may be the long-term answer. Arguably, that would enhance vanilla Git almost as much as it would enhance git-annex, but that does not seem likely to happen.
"""]]

15
doc/todo/assistant_parallel_file_transfers.txt Normal file
View file

@ -0,0 +1,15 @@
Hi and thank you for an incredible piece of software and great work!
I've noticed that when I add new files to a repository and I have my USB drive connected, the assistant alternate it's transfers of files. And only transfers one queued file at the time.
file1 -->> Internet offsite computer
file1 -->> USB drive
file2 -->> Internet offsite computer
file2 -->> USB drive
I would prefer a logic where the assistant transfer files in parallel to my different repositories. I know that it might not be a good thing doing that with network accessed repositories, but when I have "low cost", locally attached USB drives it would be great if the transfers could be done in parallel.
Is there a configuration option for this already?