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 2014-01-31 17:33:59 -04:00
commit 149527e666
7 changed files with 75 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
doc/bugs/Can__39__t_set_up_rsync.net_repo_on_OS_X_10.9.mdwn Normal file
View file

@ -0,0 +1,24 @@
### Please describe the problem.
I can't seem to add the rsync.net remote on an OS X 10.9 machine running git-annex assistant version 5.20140128-g0ac94c3. The process complains about a missing `/usr/libexec/ssh-askpass` in the logs, and after a few retries rsync.net locks me out. This program doesn't exist on my system.
### What steps will reproduce the problem?
1. Click "Add another repository"
2. Pick rsync.net
3. Enter the credentials I got in the email from rsync.net
4. Click "Use this rsync repository"
The resulting logs will state that `/usr/libexec/ssh-askpass` can't be found.
### What version of git-annex are you using? On what operating system?
git-annex assistant version 5.20140128-g0ac94c3 on OS X 10.9.1.
### Please provide any additional information below.
I think I have found a workaround in creating that program as a shell script which echoes my password to stdout, but can't test right now because rsync.net have wisely ratelimited my password login attempts. (-:
I'll update this page if I can confirm the workaround works.
(I fully intend to roll that password as soon as I'm in, so no worries about a stale password falling into evildoers' hands.)

8
doc/bugs/Repository_in_manual_mode_does_not_hold_files/comment_2_17d5775a38b67ba4f0e73f6b89cff2d0._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://launchpad.net/~maestro-alubia"
nickname="maestro-alubia"
subject="comment 2"
date="2014-01-30T20:50:32Z"
content="""
I did not configure any archive repositories or directories. But I just noticed my repository changed to \"unwanted\" in webapp. I am pretty sure I did not set this... I will set it back to manual now and see if this problem occurs again. But anyway, thanks for your help so far!
"""]]

8
doc/bugs/git-annex_sucking_up_all_available_RAM_after_startup/comment_3_14007c8e927b75c5706e80cc4242fae4._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="Hanno"
ip="85.183.3.94"
subject="comment 3"
date="2014-01-31T10:39:47Z"
content="""
The folder contains a bit more than 15000 files (counted with find -type f)
"""]]

12
doc/forum/How_to_solve__problem_with_diverging_repositories_handled_by_the_assistant__63__/comment_2_081793c52bf15c74a7f48a67c49ff818._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnNqLKszWk9EoD4CDCqNXJRIklKFBCN1Ao"
nickname="maurizio"
subject="clean up"
date="2014-01-31T19:55:30Z"
content="""
ok, now that git-annex has been updated to 5.20140117~bpo70+2 things start flowing again, so it was actually caused by [[http://git-annex.branchable.com/bugs/Jabber__47__xmpp_not_supported_on_Debian_Wheezy_backport/]]. Now there is a certain number of files called 'filename.variant.06b8' for instance. That is a bit messy.
I do not know wheter/how it would be possible to inform the user that something is going wrong, but certainely it would be better to avoid failing completely silently.
It would be useful if the webapp could give more precise information about the files the assistant is manipulating. For instance: \"now uploading file 'bla', updating version last uploaded from 'remote' on 'date'\".
"""]]

12
doc/forum/ssh__95__exchange__95__identification:_read:_Connection_reset_by_peer/comment_3_9b1911ae6468d09dae74ab1a60d2757b._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnPgn611P6ym5yyL0BS8rUzO0_ZKRldMt0"
nickname="Samuel"
subject="What are those ?"
date="2014-01-31T07:37:49Z"
content="""
Hi,
Could you please indicate what other means of file encryption systems you have in mind?
The others I know are at a partition level (cryptsetup, LUKS) and are less pratical to setup than a simple encfs.
"""]]

10
doc/internals/hashing/comment_1_9153e4f4f9335e524cf1b96a51bef41f._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnlotDRSLW2JVXY3SLSwhrcHteqUHhTtoY"
nickname="Péter"
subject="comment 1"
date="2014-01-31T00:45:47Z"
content="""
The correct old hash value for the empty file SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 is pX/ZJ .
The text describes the old hash value computation incorrectly, because it doesn't mention that 1 bit is skipped between each group of 5 bits. See the sample implementation in display_32bits_as_dir in https://github.com/joeyh/git-annex/blob/master/Locations.hs
"""]]

2
doc/tips/migrating_two_seperate_disconnected_directories_to_git_annex.mdwn
View file

@ -18,7 +18,7 @@ Start with `marcos`, with the complete directory:
git init
git annex init
git annex add .
git commit -m"git annex yay"
git commit -m "git annex yay"
This will checksum all files and add them to the `git-annex` branch of the git repository. Wait for this process to complete.