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-11 15:42:19 -04:00
commit 513368e0cc
5 changed files with 66 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
doc/bugs/git-annex_broken_on_Android_4.3/comment_20_0886bca6d0c6a9415a7794d256be2e9d._comment Normal file
View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.246"
subject="comment 20"
date="2013-11-11T16:23:11Z"
content="""
To bisect the problem space further, in case the apk build machinery is at fault, here's a git-annex binary not included in an apk. (Run same as the hello world.)
<http://tmp.kitenet.net/git-annex.bin>
And here's a more minimal git-annex binary (trying to look identical to hello world from the linker's perspective, just a bit larger..).
<http://tmp.kitenet.net/git-annex-min.bin>
"""]]

8
doc/bugs/git-annex_broken_on_Android_4.3/comment_21_2b39729f95c9c4bba620ecdd3d1558ed._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawmqz6wCn-Q1vzrsHGvEJHOt_T5ZESilxhc"
nickname="Sören"
subject="Galaxy S4 Android 4.3"
date="2013-11-11T18:47:23Z"
content="""
hello and hello.stripped both work here but the git-annex binaries don't (still the same error as in the bug report).
"""]]

16
doc/bugs/git-annex_broken_on_Android_4.3/comment_22_8d90d92951919aa70638b31e9248bec5._comment Normal file
View file

@ -0,0 +1,16 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnegApaT6kTI0Gxy9SNmI9Og-k_fC_aS7Y"
nickname="Michael Alan"
subject="Both fail..."
date="2013-11-11T18:53:34Z"
content="""
Same linking issue for both.
I don't *think* it should make any difference at all, but to spare myself a little bit of typing on this soft keyboard, I'm using a small variation on your script; I'm sharing it so other testers can use it, too, and so someone can point out if I'm doing something wrong:
D=/data/data/ga/androidterm/tmp/gatest
cp <file> $D
chmod +x $D
$D
"""]]

20
doc/bugs/git-annex_broken_on_Android_4.3/comment_23_6398271f5cd9e94996202ef3bce6f6ed._comment Normal file
View file

@ -0,0 +1,20 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.246"
subject="comment 23"
date="2013-11-11T19:14:59Z"
content="""
Script variation is ok.
So, it's looking like perhaps a problem with the way cabal links the executable, which I notice is a two stage process, vs the way ghc links it with --make.
To narrow down, here is hello built using cabal:
<http://tmp.kitenet.net/hello-cabal>
Here is git-annex built not using cabal:
<http://tmp.kitenet.net/git-annex-byhand>
(For my own reference, it's also built without WITH_CLIBS.)
"""]]

8
doc/tips/recovering_from_a_corrupt_git_repository/comment_1_f5827be97f78dbae113a5ba0c9ced896._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.246"
subject="comment 1"
date="2013-11-11T16:01:59Z"
content="""
Better, since version 4.20131024, `git annex repair` can be run to automatically do this, and more. (Including recovering data in corrupt git repositories that you forgot to push!)
"""]]