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-10-15 16:06:10 -04:00
commit 216d4bf10a
5 changed files with 63 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

17
doc/bugs/Git_annex_hangs_after_git_annex_add_on_vfat__47__sdcard__47__android/comment_1_2fc435d1c741f9fc422401f682e7c8b7._comment Normal file
View file

@ -0,0 +1,17 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="64.134.31.139"
subject="I can reproduce this! (with 4.20130923-g78e9013)"
date="2013-10-15T19:57:19Z"
content="""
Comparing straces from Android and Linux, it seems to be due to git check-attr outputting something different:
<pre>
read(16, \"andro\0annex.backend\0unspecified\0\"..., 8096) = 66
read(10, \"linux: annex.backend: unspecifie\"..., 8096) = 70
</pre>
So, this is not actually Android specific, thankfully. It's just a breakage caused by a change in a newish version of git! I think it's not yet released, just Android is building from git head right now.
I have reverted the Android stable build to the last version I think won't be affected by this.
"""]]

14
doc/bugs/cross_platform_permissions_woes/comment_1_7f01104de38a6a319a8f36aa1dc8b4b3._comment Normal file
View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="64.134.31.139"
subject="comment 1"
date="2013-10-15T18:29:10Z"
content="""
Based on the '/linux/annex/' path, your \"linux\" git remote is set up using some sort of network mount of your Linux box to Windows.
If that's the case, then rsync is running on Windows and probably doesn't know anything about permissions, to probably does something horrible when it's told to write a file to the linux filesystem.
If I'm right about that, I can easily fix it, by making git-annex on Windows not use rsync for such file to file copies. But I first need you to verify if I'm right about how your \"linux\" git remote is configured.
(Also, you should be able to work around the problem by changing the git remote to use a ssh:// url to the linux system.)
"""]]

10
doc/forum/Newbie_stuck_at___34__Unable_to_connect_to_the_Jabber_server__34__/comment_5_2685e3a87464ccd37d593516d94ba5cf._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkr_EUIHZ8CTtOGm-j-guMBzaYuOzrXJwg"
nickname="Christoph"
subject="be aware of the 2-step verification"
date="2013-10-15T20:03:12Z"
content="""
if you enabled the \"2-step verification\" in our google account (Account -> Security -> 2-step verification: Status: ON) you have to make a \"Application-specific passwords\" for your Jabber login.
NoXorius
"""]]

8
doc/forum/git-annex:_status:_1_failed/comment_10_7cd9de88e55633fc75460f4fe0400f09._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="RaspberryPie"
ip="204.8.156.142"
subject="comment 10"
date="2013-10-15T18:49:26Z"
content="""
`git annex status` complains about `.git/annex/tmp/problematic_file--`. That file doesn't exist, but `.git/annex/tmp/problematic_file-` (with one dash) does. And the file itself (no dashes) does exist in a subdir of the annex.
"""]]

14
doc/forum/git_annex_sync_dies___40__sometimes__41__/comment_1_48bbac0545bf13bbf04da723e418d037._comment Normal file
View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="64.134.31.139"
subject="comment 1"
date="2013-10-15T18:16:23Z"
content="""
Since this seems to be a problem with ssh connection caching, you can disable that:
git config annex.sshcaching false
Seems like the problem would be in the version of ssh you have installed on your linux client. Or possibly some interaction between its version and the server's version.
Since linux 2.6.32 is quite old, I'll bet you have an old ssh too.. what version?
"""]]