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-11-28 18:40:38 -04:00
commit a8e8bd4360
9 changed files with 165 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

24
doc/bugs/Android:_500___47__etc__47__resolv.conf_does_not_exist.mdwn Normal file
View file

@ -0,0 +1,24 @@
### Please describe the problem.
When entering Jabber account data, the assistant responds with:
Internal Server Error: /etc/resolv.conf does not exist (No such file or directory).
### What steps will reproduce the problem?
Get a jabber account at http://jit.si. Enter your jabber name and password on Android assistant, and click "Use This Account". The dark overlay and progress message appears. After about 30 seconds the browser forwards to the "Internal Server Error: /etc/resolv.conf does not exist (No such file or directory)" page.
### What version of git-annex are you using? On what operating system?
Android 4.2 on Lenovo 780p. This model is only for sale in China and India and has been rooted, but the original ROM is still on. Often this makes no difference but you might want to confirm with another device.
git-annex version 5.20131127-g736ce5e
### 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.
"""]]

8
doc/bugs/__91__wishlistAndroid:_bundle_an_ssh_server___40__dropbear__63____41___and_add_an_option_to_start_it_easily_with_the_terminal_app_menu/comment_3_83ac87a01639776a6e519af226bd84d5._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U"
nickname="Carlo"
subject="comment 3"
date="2013-11-28T15:28:36Z"
content="""
I made that previous suggestion... I'm using sshelper right now, outstanding server. He seems to have already worked through all kinds of android specific details for running an SSH server. Of course, you don't get all the git goodness. I wonder how hard it would be to get runshell working when logging in through SSHelper, or provide an add an SSHelper style configured OpenSSH binary for the git annex shell.
"""]]

88
doc/bugs/assistant_creating_.git_directory_inside_bare_repo.mdwn Normal file
View file

@ -0,0 +1,88 @@
### Please describe the problem.
Setting up a git annex repo with the webapp. Adding a small archive removeable disk.
Adding a file to repo. Moving file to archive. The file seems to get copied to the removeable disk
but it is not removed (dropped)from my repo, as I would expect
Before I add the file to the repo, the archive directory on the removeable drive looks like a bare repo.
After adding one file and moving it to the archive folder, a ".git" directory gets created inside the bare repo.
The .git directory contains an annex directory, and nothing else.
Is this behaviour the expected one? As far as I have understood it, the files are supposed to "disapear" from my computer when I move them to the archive folder.
### What steps will reproduce the problem?
Se above
### What version of git-annex are you using? On what operating system?
Version: 5.20131127-g736ce5e
Build flags: Assistant Webapp Pairing S3 WebDAV Inotify DBus XMPP Feeds Quvi TDFA
Chakra linux
Linux black 3.10.18-1-CHAKRA #1 SMP PREEMPT Sat Nov 9 20:18:15 UTC 2013 x86_64 GNU/Linux
git annex installed from prebuilt tar.
### Please provide any additional information below.
[[!format sh """
[2013-11-28 23:25:59 CET] main: starting assistant version 5.20131127-g736ce5e
[2013-11-28 23:25:59 CET] Cronner: You should enable consistency checking to protect your data.
(scanning...) [2013-11-28 23:25:59 CET] Watcher: Performing startup scan
(started...) gcrypt: Development version -- Repository format MAY CHANGE
gcrypt: Repository not found: /run/media/daniel/7090f0c1-abf9-47a1-a186-ba243c498172/test_ark
fatal: Not a git repository: '/run/media/daniel/7090f0c1-abf9-47a1-a186-ba243c498172/test_ark/.git'
[2013-11-28 23:26:21 CET] main: Syncing with 7090f0c1abf947a1a186ba243c498172
warning: no common commits
From /run/media/daniel/7090f0c1-abf9-47a1-a186-ba243c498172/test_ark
* [new branch] git-annex -> 7090f0c1abf947a1a186ba243c498172/git-annex
* [new branch] master -> 7090f0c1abf947a1a186ba243c498172/master
Already up-to-date.
To /run/media/daniel/7090f0c1-abf9-47a1-a186-ba243c498172/test_ark
* [new branch] git-annex -> synced/git-annex
* [new branch] annex/direct/master -> synced/master
Already up-to-date.
Already up-to-date.
[2013-11-28 23:26:59 CET] Pusher: Syncing with test_ark
To /run/media/daniel/7090f0c1-abf9-47a1-a186-ba243c498172/test_ark
4d435e3..e548577 git-annex -> synced/git-annex
[2013-11-28 23:27:17 CET] Committer: Adding git-annex..64.tar.gz
(Recording state in git...)
(merging 7090f0c1abf947a1a186ba243c498172/git-annex into git-annex...)
(Recording state in git...)
(Recording state in git...)
add git-annex-standalone-amd64.tar.gz (checksum...) [2013-11-28 23:27:17 CET] Committer: Committing changes to git
[2013-11-28 23:27:17 CET] Pusher: Syncing with test_ark
Already up-to-date.
To /run/media/daniel/7090f0c1-abf9-47a1-a186-ba243c498172/test_ark
e548577..b86f41c git-annex -> synced/git-annex
658b0f2..f32a646 annex/direct/master -> synced/master
Already up-to-date.
[2013-11-28 23:27:27 CET] Committer: Adding git-annex..64.tar.gz
[2013-11-28 23:27:27 CET] Committer: Committing changes to git
[2013-11-28 23:27:27 CET] Pusher: Syncing with test_ark
git-annex-standalone-amd64.tar.gz
32768 0% 0.00kB/s 0:00:00 Already up-to-date.
To /run/media/daniel/7090f0c1-abf9-47a1-a186-ba243c498172/test_ark
b86f41c..806a2dd git-annex -> synced/git-annex
f32a646..5e254e7 annex/direct/master -> synced/master
Already up-to-date.
20143752 100% 85.24MB/s 0:00:00 (xfer#1, to-check=0/1)
sent 20146306 bytes received 31 bytes 40292674.00 bytes/sec
total size is 20143752 speedup is 1.00
fatal: Not a git repository: '/run/media/daniel/7090f0c1-abf9-47a1-a186-ba243c498172/test_ark/.git'
fatal: Not a git repository: '/run/media/daniel/7090f0c1-abf9-47a1-a186-ba243c498172/test_ark/.git'
fatal: Not a git repository: '/run/media/daniel/7090f0c1-abf9-47a1-a186-ba243c498172/test_ark/.git'
[2013-11-28 23:27:59 CET] Pusher: Syncing with test_ark
Everything up-to-date
# End of transcript or log.
"""]]

12
doc/forum/New_special_remote_suggeston_-_clean_directory/comment_3_eed178ce4bc4d2b3f08a1e3d3d62c086._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="http://a-or-b.myopenid.com/"
ip="203.45.2.230"
subject="comment 3"
date="2013-11-28T02:36:15Z"
content="""
+1 on this suggestion.
Not all NASs are created equal so SAMBA/NFS isn't always the most recent version, upgrades aren't always possible (yes, I'm looking at you Drobo!) so sometimes you just can't do what g-a needs to do (locks are my big problem).
This would be a great option to have, even with the downsides of losing a lot of the awesome-sauce of git-annex.
"""]]

10
doc/forum/assitant:_special_remote_server___40__needs_ssh_tunnel__41__.mdwn Normal file
View file

@ -0,0 +1,10 @@
To connect to a remote server I have to tunnel it through a server I have access to. My .ssh/config for this connection looks like this:
Host server-at-home
HostName foo.bar.de
User foo
Port 222
ProxyCommand /usr/bin/ssh me@server-i-have-access-to /bin/nc -w 3700 %h %p
Is it possible to create a connection using a similar configuration via the git-annex assistant?

8
doc/forum/assitant:_special_remote_server___40__needs_ssh_tunnel__41__/comment_1_817a3ed424e4fb76fcd33295f2953250._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8"
nickname="Hamza"
subject="comment 1"
date="2013-11-28T22:08:04Z"
content="""
You can add/clone from the remote from the command line and webapp will use it.
"""]]

4
doc/tips/recover_data_from_lost+found.mdwn
View file

@ -8,8 +8,8 @@ First, check out the git repository again. Then, in the new checkout:
$ sudo chown you:you recovered-content
$ chmod -R u+w recovered-content
$ git annex add recovered-content
$ git rm recovered-content
$ git commit -m "recovered some content"
$ git reset HEAD recovered-content
$ rm -rf recovered-content
$ git annex fsck
The way that works is that when git-annex adds the same content that was in

2
doc/tips/using_box.com_as_a_special_remote.mdwn
View file

@ -5,7 +5,7 @@ for providing 50 gb of free storage if you sign up with its Android client.
git-annex can use Box as a [[special remote|special_remotes]].
Recent versions of git-annex make this very easy to set up:
WEBDAV_USERNAME=you@example.com WEBDAV_PASSWORD=xxxxxxx git annex initremote box.com type=webdav url=https://www.box.com/dav/git-annex chunksize=75mb encryption=shared
WEBDAV_USERNAME=you@example.com WEBDAV_PASSWORD=xxxxxxx git annex initremote box.com type=webdav url=https://dav.box.com/dav/git-annex chunksize=75mb encryption=shared
Note the use of chunksize; Box has a 100 mb maximum file size, and this
breaks up large files into chunks before that limit is reached.

12
doc/todo/Not_working_on_Android-x86/comment_2_e5c4c99cb0675ad69bf8d7796be23c8e._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawlYSw35UMlOf9rFlP5EUTBz7is5X09qVXI"
nickname="Johannes"
subject="Support on Motorola razr i"
date="2013-11-28T16:10:38Z"
content="""
Hi,
I'm using the Motorola razr i. So there is a usecase, where a x86 CPU is used in a mobile phone. If it's easy as you described, can you build a Version with x86 support?
Thanks
Jack
"""]]